diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh index 28ef0b968..daf12c254 100755 --- a/plugins/php/versions/52/install.sh +++ b/plugins/php/versions/52/install.sh @@ -82,18 +82,11 @@ if [ -f $serverPath/php/${PHP_VER}/bin/php ];then return fi -OPTIONS='' +OPTIONS='--without-iconv' if [ $sysName == 'Darwin' ]; then - OPTIONS='--without-iconv' OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" - OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl" -else - OPTIONS='--without-iconv' - # OPTIONS="--with-iconv=${serverPath}/lib/libiconv" - OPTIONS="${OPTIONS} --with-curl" fi - IS_64BIT=`getconf LONG_BIT` if [ "$IS_64BIT" == "64" ];then OPTIONS="${OPTIONS} --with-libdir=lib64" diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh index 421caefd7..839d8dcb0 100755 --- a/plugins/php/versions/53/install.sh +++ b/plugins/php/versions/53/install.sh @@ -66,12 +66,7 @@ fi # OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib" OPTIONS='--without-iconv' if [ $sysName == 'Darwin' ]; then - OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" - OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)" -else - # OPTIONS=" --with-iconv=${serverPath}/lib/libiconv" - OPTIONS="${OPTIONS} --with-curl" fi IS_64BIT=`getconf LONG_BIT` diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh index e32ace308..58af0987f 100755 --- a/plugins/php/versions/54/install.sh +++ b/plugins/php/versions/54/install.sh @@ -59,21 +59,11 @@ fi OPTIONS='--without-iconv' if [ $sysName == 'Darwin' ]; then - OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" - - BREW_DIR=`which brew` - BREW_DIR=${BREW_DIR/\/bin\/brew/} - CURL_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \ -f 1 | awk 'END {print}'` - OPTIONS="$OPTIONS --with-curl=${CURL_DEPEND_DIR}" # OPTIONS="${OPTIONS} --with-pcre-dir=${serverPath}/lib/pcre" # OPTIONS="${OPTIONS} --with-external-pcre=${serverPath}/lib/pcre" - else - # OPTIONS="--with-iconv=${serverPath}/lib/libiconv" - OPTIONS="${OPTIONS} --with-curl" OPTIONS="${OPTIONS} --enable-mbstring" - OPTIONS="${OPTIONS} --with-readline" fi IS_64BIT=`getconf LONG_BIT` diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh index 96f869c46..59f5712c6 100755 --- a/plugins/php/versions/55/install.sh +++ b/plugins/php/versions/55/install.sh @@ -59,14 +59,9 @@ fi OPTIONS='--without-iconv' if [ $sysName == 'Darwin' ]; then - OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" - OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)" else - # OPTIONS="--with-iconv=${serverPath}/lib/libiconv" - OPTIONS="${OPTIONS} --with-curl" OPTIONS="${OPTIONS} --enable-mbstring" - OPTIONS="${OPTIONS} --with-readline" fi IS_64BIT=`getconf LONG_BIT` diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh index 3b7e8c060..b26aa6606 100755 --- a/plugins/php/versions/56/install.sh +++ b/plugins/php/versions/56/install.sh @@ -63,14 +63,9 @@ fi OPTIONS='--without-iconv' if [ $sysName == 'Darwin' ]; then OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" - OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)" OPTIONS="${OPTIONS} --with-zlib-dir=$(brew --prefix zlib)" - # OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)" else - # OPTIONS="--with-iconv=${serverPath}/lib/libiconv" - OPTIONS="${OPTIONS} --with-curl" OPTIONS="${OPTIONS} --enable-mbstring" - OPTIONS="${OPTIONS} --with-readline" fi IS_64BIT=`getconf LONG_BIT` diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh index 0e7d474e5..ebe243815 100755 --- a/plugins/php/versions/70/install.sh +++ b/plugins/php/versions/70/install.sh @@ -60,12 +60,7 @@ fi OPTIONS='--without-iconv' if [ $sysName == 'Darwin' ]; then OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" - OPTIONS="${OPTIONS} --with-curl" # OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)" -else - # OPTIONS="--with-iconv=${serverPath}/lib/libiconv" - OPTIONS="${OPTIONS} --with-curl" - OPTIONS="${OPTIONS} --with-readline" fi IS_64BIT=`getconf LONG_BIT` diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh index b5881c8f0..20bcb6c94 100755 --- a/plugins/php/versions/71/install.sh +++ b/plugins/php/versions/71/install.sh @@ -61,11 +61,7 @@ OPTIONS='' OPTIONS='--without-iconv' if [ $sysName == 'Darwin' ]; then OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" - OPTIONS="${OPTIONS} --with-curl" OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)" -else - OPTIONS="${OPTIONS} --with-curl" - OPTIONS="${OPTIONS} --with-readline" fi IS_64BIT=`getconf LONG_BIT` diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh index 5e2bb9142..1cc80f08a 100755 --- a/plugins/php/versions/72/install.sh +++ b/plugins/php/versions/72/install.sh @@ -58,13 +58,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then fi OPTIONS='--without-iconv' -if [ $sysName == 'Darwin' ]; then - OPTIONS="${OPTIONS} --with-curl" -else - OPTIONS="${OPTIONS} --with-curl" - OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib" - OPTIONS="${OPTIONS} --with-readline" -fi +OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib" IS_64BIT=`getconf LONG_BIT` if [ "$IS_64BIT" == "64" ];then diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh index 3d619b7d0..1900b0838 100755 --- a/plugins/php/versions/73/install.sh +++ b/plugins/php/versions/73/install.sh @@ -75,7 +75,6 @@ if [ $sysName == 'Darwin' ]; then OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)" OPTIONS="${OPTIONS} --with-pcre-dir=$(brew --prefix pcre2)" else - OPTIONS="${OPTIONS} --with-curl" OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib" OPTIONS="${OPTIONS} ${ZIP_OPTION}" OPTIONS="${OPTIONS} --with-readline" diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh index e21252768..17ee9609e 100755 --- a/plugins/php/versions/74/install.sh +++ b/plugins/php/versions/74/install.sh @@ -80,19 +80,7 @@ cd $sourcePath/php/php${PHP_VER} OPTIONS='--without-iconv' if [ $sysName == 'Darwin' ]; then - - OPTIONS="${OPTIONS} --with-curl" OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)" - - # BREW_DIR=`which brew` - # BREW_DIR=${BREW_DIR/\/bin\/brew/} - # XML_LIB_DEPEND_DIR=`brew info libxml2 | grep /opt/homebrew/Cellar/libxml2 | cut -d \ -f 1 | awk 'END {print}'` - # XML_LIB_DEPEND_DIR=`brew info libxml2 | grep ${BREW_DIR}/Cellar/libxml2 | cut -d \ -f 1 | awk 'END {print}'` - # OPTIONS="${OPTIONS} --with-libxml=${XML_LIB_DEPEND_DIR}" - -else - OPTIONS="${OPTIONS} --with-curl" - OPTIONS="${OPTIONS} --with-readline" fi IS_64BIT=`getconf LONG_BIT` diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh index 5ef789c72..1d84e4685 100755 --- a/plugins/php/versions/80/install.sh +++ b/plugins/php/versions/80/install.sh @@ -71,13 +71,9 @@ fi cd $sourcePath/php/php${PHP_VER} OPTIONS='--without-iconv' + if [ $sysName == 'Darwin' ]; then - OPTIONS="${OPTIONS} --with-curl" OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)" -else - # OPTIONS="--with-iconv=${serverPath}/lib/libiconv" - OPTIONS="${OPTIONS} --with-curl" - OPTIONS="${OPTIONS} --with-readline" fi IS_64BIT=`getconf LONG_BIT` diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh index efbec9804..aef036d86 100755 --- a/plugins/php/versions/81/install.sh +++ b/plugins/php/versions/81/install.sh @@ -71,12 +71,9 @@ fi cd $sourcePath/php/php${PHP_VER} OPTIONS='--without-iconv' -if [ $sysName == 'Darwin' ]; then - OPTIONS="${OPTIONS} --with-curl" -else - OPTIONS="${OPTIONS} --with-curl" - OPTIONS="${OPTIONS} --with-readline" -fi +# if [ $sysName == 'Darwin' ]; then +# OPTIONS="${OPTIONS} --with-curl" +# fi argon_version=`pkg-config libargon2 --modversion` if [ "$?" == "0" ];then diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh index dc7b2c14a..b10c42953 100755 --- a/plugins/php/versions/82/install.sh +++ b/plugins/php/versions/82/install.sh @@ -72,15 +72,12 @@ fi cd $sourcePath/php/php${PHP_VER} OPTIONS='--without-iconv' -if [ $sysName == 'Darwin' ]; then - BREW_DIR=`which brew` - BREW_DIR=${BREW_DIR/\/bin\/brew/} - LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \ -f 1 | awk 'END {print}'` - OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR" -else - OPTIONS="${OPTIONS} --with-curl" - OPTIONS="${OPTIONS} --with-readline" -fi +# if [ $sysName == 'Darwin' ]; then +# BREW_DIR=`which brew` +# BREW_DIR=${BREW_DIR/\/bin\/brew/} +# LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \ -f 1 | awk 'END {print}'` +# OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR" +# fi IS_64BIT=`getconf LONG_BIT` if [ "$IS_64BIT" == "64" ];then diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh index 979282dfd..334864df3 100755 --- a/plugins/php/versions/83/install.sh +++ b/plugins/php/versions/83/install.sh @@ -71,16 +71,9 @@ fi cd $sourcePath/php/php${PHP_VER} OPTIONS='--without-iconv' -if [ $sysName == 'Darwin' ]; then - # BREW_DIR=`which brew` - # BREW_DIR=${BREW_DIR/\/bin\/brew/} - # LIB_DEPEND_DIR=`brew info curl | grep ${BREW_DIR}/Cellar/curl | cut -d \ -f 1 | awk 'END {print}'` - # OPTIONS="${OPTIONS} --with-curl=$LIB_DEPEND_DIR" - echo "curl" -else - OPTIONS="${OPTIONS} --with-curl" - OPTIONS="${OPTIONS} --with-readline" -fi +# if [ $sysName == 'Darwin' ]; then +# OPTIONS="${OPTIONS} --with-curl" +# fi argon_version=`pkg-config libargon2 --modversion` if [ "$?" == "0" ];then diff --git a/plugins/php/versions/84/install.sh b/plugins/php/versions/84/install.sh index ea47ee991..5b1d0bac2 100755 --- a/plugins/php/versions/84/install.sh +++ b/plugins/php/versions/84/install.sh @@ -56,13 +56,10 @@ fi cd $sourcePath/php/php${PHP_VER} OPTIONS='--without-iconv' -if [ $sysName == 'Darwin' ]; then - # OPTIONS="${OPTIONS} --with-curl" - echo "curl pass" -else - OPTIONS="${OPTIONS} --with-curl" - OPTIONS="${OPTIONS} --with-readline" -fi + +# if [ $sysName == 'Darwin' ]; then +# OPTIONS="${OPTIONS} --with-curl" +# fi argon_version=`pkg-config libargon2 --modversion` if [ "$?" == "0" ];then diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf index 0dd87e352..f74c87cc5 100755 --- a/plugins/php/versions/phplib.conf +++ b/plugins/php/versions/phplib.conf @@ -419,6 +419,30 @@ "shell": "intl.sh", "check": "intl.so" }, + { + "name": "readline", + "versions": [ + "52", + "53", + "54", + "55", + "56", + "70", + "71", + "72", + "73", + "74", + "80", + "81", + "82", + "83", + "84" + ], + "type": "通用扩展", + "msg": "命令行的支持", + "shell": "readline.sh", + "check": "readline.so" + }, { "name": "memcache", "versions": [