diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh index daf12c254..7516e0f04 100755 --- a/plugins/php/versions/52/install.sh +++ b/plugins/php/versions/52/install.sh @@ -105,8 +105,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --prefix=$serverPath/php/${PHP_VER} \ --exec-prefix=$serverPath/php/${PHP_VER} \ --with-config-file-path=$serverPath/php/${PHP_VER}/etc \ - --with-zlib-dir=$serverPath/lib/zlib \ - --enable-zip \ --enable-xml \ --enable-shared \ --with-mysql=mysqlnd \ diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh index 151fafc88..0ee811212 100755 --- a/plugins/php/versions/53/install.sh +++ b/plugins/php/versions/53/install.sh @@ -109,12 +109,10 @@ if [ ! -d $serverPath/php/${PHP_VER}/bin ];then --prefix=$serverPath/php/${PHP_VER} \ --exec-prefix=$serverPath/php/${PHP_VER} \ --with-config-file-path=$serverPath/php/${PHP_VER}/etc \ - --with-zlib-dir=$serverPath/lib/zlib \ --enable-mysqlnd \ --with-mysql=mysqlnd \ --with-pdo-mysql=mysqlnd \ --with-mysqli=mysqlnd \ - --enable-zip \ --enable-exif \ --enable-hash \ --enable-libxml \ diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh index fc3dd9393..aa9d63726 100755 --- a/plugins/php/versions/54/install.sh +++ b/plugins/php/versions/54/install.sh @@ -112,7 +112,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --prefix=$serverPath/php/${PHP_VER} \ --exec-prefix=$serverPath/php/${PHP_VER} \ --with-config-file-path=$serverPath/php/${PHP_VER}/etc \ - --with-zlib-dir=$serverPath/lib/zlib \ --enable-mysqlnd \ --with-mysql=mysqlnd \ --with-pdo-mysql=mysqlnd \ diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh index c625f903e..03a472dc1 100755 --- a/plugins/php/versions/55/install.sh +++ b/plugins/php/versions/55/install.sh @@ -112,7 +112,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --prefix=$serverPath/php/${PHP_VER} \ --exec-prefix=$serverPath/php/${PHP_VER} \ --with-config-file-path=$serverPath/php/${PHP_VER}/etc \ - --with-zlib-dir=$serverPath/lib/zlib \ --enable-mysqlnd \ --with-mysql=mysqlnd \ --with-pdo-mysql=mysqlnd \ diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh index 8f2f20e05..9b1de0bab 100755 --- a/plugins/php/versions/56/install.sh +++ b/plugins/php/versions/56/install.sh @@ -121,7 +121,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --prefix=$serverPath/php/${PHP_VER} \ --exec-prefix=$serverPath/php/${PHP_VER} \ --with-config-file-path=$serverPath/php/56/etc \ - --with-zlib-dir=$serverPath/lib/zlib \ --enable-mysqlnd \ --with-mysql=mysqlnd \ --with-pdo-mysql=mysqlnd \ diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh index 328ef6ee5..26c0e9718 100755 --- a/plugins/php/versions/70/install.sh +++ b/plugins/php/versions/70/install.sh @@ -109,7 +109,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --enable-mysqlnd \ --with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ - --with-zlib-dir=$serverPath/lib/zlib \ --enable-mbstring \ --enable-simplexml \ --enable-ftp \ diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh index 872491126..af94469a2 100755 --- a/plugins/php/versions/71/install.sh +++ b/plugins/php/versions/71/install.sh @@ -108,7 +108,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --prefix=$serverPath/php/${PHP_VER} \ --exec-prefix=$serverPath/php/${PHP_VER} \ --with-config-file-path=$serverPath/php/${PHP_VER}/etc \ - --with-zlib-dir=$serverPath/lib/zlib \ --enable-mysqlnd \ --with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh index 430e48c1c..a73e7a8fb 100755 --- a/plugins/php/versions/73/install.sh +++ b/plugins/php/versions/73/install.sh @@ -10,11 +10,6 @@ sourcePath=${serverPath}/source sysName=`uname` SYS_ARCH=`arch` -function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } -function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; } -function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; } -function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } - version=7.3.33 PHP_VER=73 Install_php() diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh index e99d2c3aa..33e0415ef 100755 --- a/plugins/php/versions/74/install.sh +++ b/plugins/php/versions/74/install.sh @@ -9,11 +9,6 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source sysName=`uname` -function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } -function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; } -function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; } -function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } - version=7.4.26 PHP_VER=74 Install_php() @@ -133,7 +128,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --enable-mysqlnd \ --with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ - --with-zlib-dir=$serverPath/lib/zlib \ --enable-ftp \ --enable-mbstring \ --enable-sockets \ diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh index e9bacab5f..48c15b75d 100755 --- a/plugins/php/versions/80/install.sh +++ b/plugins/php/versions/80/install.sh @@ -9,12 +9,6 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source sysName=`uname` -function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } -function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; } -function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; } -function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } - - version=8.0.30 PHP_VER=80 Install_php() @@ -88,13 +82,13 @@ fi # fi -ZIP_OPTION='--with-zip' -libzip_version=`pkg-config libzip --modversion` -if version_lt "$libzip_version" "0.11.0" ;then - cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh - export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig - ZIP_OPTION="--with-zip=$serverPath/lib/libzip" -fi +# ZIP_OPTION='--with-zip' +# libzip_version=`pkg-config libzip --modversion` +# if version_lt "$libzip_version" "0.11.0" ;then +# cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh +# export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig +# ZIP_OPTION="--with-zip=$serverPath/lib/libzip" +# fi # ----- cpu start ------ @@ -134,8 +128,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --enable-mysqlnd \ --with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ - --with-zlib-dir=$serverPath/lib/zlib \ - $ZIP_OPTION \ --enable-ftp \ --enable-mbstring \ --enable-sockets \ diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh index 693975011..c77959699 100755 --- a/plugins/php/versions/81/install.sh +++ b/plugins/php/versions/81/install.sh @@ -9,12 +9,6 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source sysName=`uname` -function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } -function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; } -function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; } -function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } - - version=8.1.31 PHP_VER=81 Install_php() @@ -80,13 +74,13 @@ if [ "$?" == "0" ];then OPTIONS="${OPTIONS} --with-password-argon2" fi -ZIP_OPTION='--with-zip' -libzip_version=`pkg-config libzip --modversion` -if version_lt "$libzip_version" "0.11.0" ;then - cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh - export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig - ZIP_OPTION="--with-zip=$serverPath/lib/libzip" -fi +# ZIP_OPTION='--with-zip' +# libzip_version=`pkg-config libzip --modversion` +# if version_lt "$libzip_version" "0.11.0" ;then +# cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh +# export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig +# ZIP_OPTION="--with-zip=$serverPath/lib/libzip" +# fi # ----- cpu start ------ if [ -z "${cpuCore}" ]; then @@ -125,8 +119,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --enable-mysqlnd \ --with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ - --with-zlib-dir=$serverPath/lib/zlib \ - $ZIP_OPTION \ --enable-ftp \ --enable-mbstring \ --enable-sockets \ diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh index a4c9b2edd..e0524e1a8 100755 --- a/plugins/php/versions/82/install.sh +++ b/plugins/php/versions/82/install.sh @@ -9,12 +9,6 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source sysName=`uname` -function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } -function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; } -function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; } -function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } - - version=8.2.26 PHP_VER=82 Install_php() @@ -108,13 +102,13 @@ else fi # ----- cpu end ------ -ZIP_OPTION='--with-zip' -libzip_version=`pkg-config libzip --modversion` -if version_lt "$libzip_version" "0.11.0" ;then - cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh - export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig - ZIP_OPTION="--with-zip=$serverPath/lib/libzip" -fi +# ZIP_OPTION='--with-zip' +# libzip_version=`pkg-config libzip --modversion` +# if version_lt "$libzip_version" "0.11.0" ;then +# cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh +# export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig +# ZIP_OPTION="--with-zip=$serverPath/lib/libzip" +# fi # echo "$sourcePath/php/php${PHP_VER}" @@ -128,8 +122,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --enable-mysqlnd \ --with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ - --with-zlib-dir=$serverPath/lib/zlib \ - $ZIP_OPTION \ --enable-mbstring \ --enable-ftp \ --enable-sockets \ diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh index d4b8790aa..d9f3bc7b2 100755 --- a/plugins/php/versions/83/install.sh +++ b/plugins/php/versions/83/install.sh @@ -9,11 +9,6 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source sysName=`uname` -function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } -function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; } -function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; } -function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } - version=8.3.14 PHP_VER=83 Install_php() @@ -107,13 +102,13 @@ else fi # ----- cpu end ------ -ZIP_OPTION='--with-zip' -libzip_version=`pkg-config libzip --modversion` -if version_lt "$libzip_version" "0.11.0" ;then - cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh - export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig - ZIP_OPTION="--with-zip=$serverPath/lib/libzip" -fi +# ZIP_OPTION='--with-zip' +# libzip_version=`pkg-config libzip --modversion` +# if version_lt "$libzip_version" "0.11.0" ;then +# cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh +# export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig +# ZIP_OPTION="--with-zip=$serverPath/lib/libzip" +# fi echo "$sourcePath/php/php${PHP_VER}" @@ -128,8 +123,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --enable-mysqlnd \ --with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ - --with-zlib-dir=$serverPath/lib/zlib \ - $ZIP_OPTION \ --enable-mbstring \ --enable-ftp \ --enable-sockets \ diff --git a/plugins/php/versions/84/install.sh b/plugins/php/versions/84/install.sh index 9e4e421e8..b565e9195 100755 --- a/plugins/php/versions/84/install.sh +++ b/plugins/php/versions/84/install.sh @@ -9,11 +9,6 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source sysName=`uname` -function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } -function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; } -function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; } -function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } - version=8.4.1 PHP_VER=84 Install_php() @@ -96,17 +91,18 @@ else fi # ----- cpu end ------ -ZIP_OPTION='--with-zip' -libzip_version=`pkg-config libzip --modversion` -if version_lt "$libzip_version" "0.11.0" ;then - cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh - export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig - ZIP_OPTION="--with-zip=$serverPath/lib/libzip" -fi +# ZIP_OPTION='--with-zip' +# libzip_version=`pkg-config libzip --modversion` +# if version_lt "$libzip_version" "0.11.0" ;then +# cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh +# export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig +# ZIP_OPTION="--with-zip=$serverPath/lib/libzip" +# fi # OPTIONS="${OPTIONS} --enable-debug" # OPTIONS="${OPTIONS} --enable-dtrace" + echo "$sourcePath/php/php${PHP_VER}" if [ ! -d $serverPath/php/${PHP_VER} ];then @@ -119,8 +115,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --enable-mysqlnd \ --with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ - --with-zlib-dir=$serverPath/lib/zlib \ - $ZIP_OPTION \ --enable-mbstring \ --enable-ftp \ --enable-sockets \ diff --git a/plugins/php/versions/common/zlib.sh b/plugins/php/versions/common/zlib.sh index 407923fcc..81291da52 100755 --- a/plugins/php/versions/common/zlib.sh +++ b/plugins/php/versions/common/zlib.sh @@ -34,6 +34,7 @@ else BAK='' fi +# --with-zlib-dir=$serverPath/lib/zlib Install_lib() {