From 65c303272c9aeb23b321fecbbd72d6b831753167 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 10 Dec 2024 02:23:49 +0800
Subject: [PATCH] update

---
 plugins/php/versions/52/install.sh      |  2 ++
 plugins/php/versions/53/install.sh      |  9 ++++++---
 plugins/php/versions/54/install.sh      |  3 ++-
 plugins/php/versions/55/install.sh      |  3 ++-
 plugins/php/versions/56/install.sh      |  3 ++-
 plugins/php/versions/70/install.sh      |  2 ++
 plugins/php/versions/71/install.sh      |  2 ++
 plugins/php/versions/72/install.sh      |  8 ++++++--
 plugins/php/versions/73/install.sh      |  1 -
 plugins/php/versions/common/readline.sh | 11 ++++-------
 plugins/php/versions/phplib.conf        |  9 ---------
 11 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh
index 7516e0f04..816e3f940 100755
--- a/plugins/php/versions/52/install.sh
+++ b/plugins/php/versions/52/install.sh
@@ -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`
diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh
index 0ee811212..cf8d799be 100755
--- a/plugins/php/versions/53/install.sh
+++ b/plugins/php/versions/53/install.sh
@@ -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 \
diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh
index aa9d63726..5c0012883 100755
--- a/plugins/php/versions/54/install.sh
+++ b/plugins/php/versions/54/install.sh
@@ -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 \
diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh
index 03a472dc1..4331d545e 100755
--- a/plugins/php/versions/55/install.sh
+++ b/plugins/php/versions/55/install.sh
@@ -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 \
diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh
index 9b1de0bab..85259ac0b 100755
--- a/plugins/php/versions/56/install.sh
+++ b/plugins/php/versions/56/install.sh
@@ -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 \
diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh
index 26c0e9718..2225bc953 100755
--- a/plugins/php/versions/70/install.sh
+++ b/plugins/php/versions/70/install.sh
@@ -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`
diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh
index af94469a2..9a1983fa9 100755
--- a/plugins/php/versions/71/install.sh
+++ b/plugins/php/versions/71/install.sh
@@ -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`
diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh
index 5ae7cc8d6..dbddba573 100755
--- a/plugins/php/versions/72/install.sh
+++ b/plugins/php/versions/72/install.sh
@@ -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"
diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh
index a73e7a8fb..c9a1b2ff6 100755
--- a/plugins/php/versions/73/install.sh
+++ b/plugins/php/versions/73/install.sh
@@ -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
 
diff --git a/plugins/php/versions/common/readline.sh b/plugins/php/versions/common/readline.sh
index 6307b9805..71c13ad56 100755
--- a/plugins/php/versions/common/readline.sh
+++ b/plugins/php/versions/common/readline.sh
@@ -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
diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf
index 98c978093..228cfa5d2 100755
--- a/plugins/php/versions/phplib.conf
+++ b/plugins/php/versions/phplib.conf
@@ -440,15 +440,6 @@
     {
         "name": "readline",
         "versions": [
-            "52",
-            "53",
-            "54",
-            "55",
-            "56",
-            "70",
-            "71",
-            "72",
-            "73",
             "74",
             "80",
             "81",