This commit is contained in:
Mr Chen 2024-12-10 02:23:49 +08:00
parent 2be356a875
commit 65c303272c
11 changed files with 28 additions and 25 deletions

View File

@ -85,6 +85,8 @@ fi
OPTIONS='--without-iconv'
if [ $sysName == 'Darwin' ]; then
OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
else
OPTIONS="${OPTIONS} --with-readline"
fi
IS_64BIT=`getconf LONG_BIT`

View File

@ -66,9 +66,11 @@ 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"
# fi
if [ $sysName == 'Darwin' ]; then
OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
else
OPTIONS="${OPTIONS} --with-readline"
fi
IS_64BIT=`getconf LONG_BIT`
if [ "$IS_64BIT" == "64" ];then
@ -113,6 +115,7 @@ if [ ! -d $serverPath/php/${PHP_VER}/bin ];then
--with-mysql=mysqlnd \
--with-pdo-mysql=mysqlnd \
--with-mysqli=mysqlnd \
--enable-mbstring \
--enable-exif \
--enable-hash \
--enable-libxml \

View File

@ -63,7 +63,7 @@ if [ $sysName == 'Darwin' ]; then
# OPTIONS="${OPTIONS} --with-pcre-dir=${serverPath}/lib/pcre"
# OPTIONS="${OPTIONS} --with-external-pcre=${serverPath}/lib/pcre"
else
OPTIONS="${OPTIONS} --enable-mbstring"
OPTIONS="${OPTIONS} --with-readline"
fi
IS_64BIT=`getconf LONG_BIT`
@ -116,6 +116,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
--with-mysql=mysqlnd \
--with-pdo-mysql=mysqlnd \
--with-mysqli=mysqlnd \
--enable-mbstring \
--enable-sockets \
--enable-ftp \
--enable-simplexml \

View File

@ -61,7 +61,7 @@ OPTIONS='--without-iconv'
if [ $sysName == 'Darwin' ]; then
OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
else
OPTIONS="${OPTIONS} --enable-mbstring"
OPTIONS="${OPTIONS} --with-readline"
fi
IS_64BIT=`getconf LONG_BIT`
@ -116,6 +116,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
--with-mysql=mysqlnd \
--with-pdo-mysql=mysqlnd \
--with-mysqli=mysqlnd \
--enable-mbstring \
--enable-simplexml \
--enable-sockets \
--enable-ftp \

View File

@ -65,7 +65,7 @@ if [ $sysName == 'Darwin' ]; then
OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
OPTIONS="${OPTIONS} --with-zlib-dir=$(brew --prefix zlib)"
else
OPTIONS="${OPTIONS} --enable-mbstring"
OPTIONS="${OPTIONS} --with-readline"
fi
IS_64BIT=`getconf LONG_BIT`
@ -125,6 +125,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
--with-mysql=mysqlnd \
--with-pdo-mysql=mysqlnd \
--with-mysqli=mysqlnd \
--enable-mbstring \
--enable-simplexml \
--enable-ftp \
--enable-sockets \

View File

@ -61,6 +61,8 @@ OPTIONS='--without-iconv'
if [ $sysName == 'Darwin' ]; then
OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
# OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
else
OPTIONS="${OPTIONS} --with-readline"
fi
IS_64BIT=`getconf LONG_BIT`

View File

@ -62,6 +62,8 @@ OPTIONS='--without-iconv'
if [ $sysName == 'Darwin' ]; then
OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
else
OPTIONS="${OPTIONS} --with-readline"
fi
IS_64BIT=`getconf LONG_BIT`

View File

@ -58,8 +58,12 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
fi
OPTIONS='--without-iconv'
OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib"
if [ $sysName == 'Darwin' ]; then
OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
OPTIONS="${OPTIONS} --with-pcre-dir=$(brew --prefix pcre2)"
else
OPTIONS="${OPTIONS} --with-readline"
fi
IS_64BIT=`getconf LONG_BIT`
if [ "$IS_64BIT" == "64" ];then
OPTIONS="${OPTIONS} --with-libdir=lib64"

View File

@ -70,7 +70,6 @@ if [ $sysName == 'Darwin' ]; then
OPTIONS="${OPTIONS} --with-curl=$(brew --prefix curl)"
OPTIONS="${OPTIONS} --with-pcre-dir=$(brew --prefix pcre2)"
else
OPTIONS="${OPTIONS} --with-zlib-dir=$serverPath/lib/zlib"
OPTIONS="${OPTIONS} --with-readline"
fi

View File

@ -21,7 +21,10 @@ version=$2
LIBNAME=readline
LIBV=0
if [ "$version" -lt "74" ];then
echo "not need"
exit 0
fi
LIB_PATH_NAME=lib/php
if [ -d $serverPath/php/${version}/lib64 ];then
@ -65,14 +68,8 @@ Install_lib()
cd ${rootPath}/plugins/php/lib && /bin/bash libedit.sh
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${serverPath}/lib/libedit/lib/pkgconfig
OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
readlinelib=`pkg-config --path readline`
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${serverPath}/lib/libedit/lib/pkgconfig
OPTIONS="$OPTIONS --with-libedit=${serverPath}/lib/libedit"
cd $sourcePath/php${version}/ext/${LIBNAME}
$serverPath/php/$version/bin/phpize
./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS

View File

@ -440,15 +440,6 @@
{
"name": "readline",
"versions": [
"52",
"53",
"54",
"55",
"56",
"70",
"71",
"72",
"73",
"74",
"80",
"81",