From 4329d2470cdda07b805948eb596e4e9cc0be9b0b Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sun, 13 Aug 2023 13:57:46 +0800
Subject: [PATCH] update

---
 plugins/php/versions/common/intl.sh    |  4 +---
 plugins/php/versions/common/phalcon.sh |  1 +
 plugins/php/versions/common/xhprof.sh  |  9 +++++++--
 plugins/php/versions/common/yaf.sh     | 10 +++++++---
 plugins/php/versions/common/yar.sh     |  8 +++++++-
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/plugins/php/versions/common/intl.sh b/plugins/php/versions/common/intl.sh
index 2bac59fde..d84b3882b 100755
--- a/plugins/php/versions/common/intl.sh
+++ b/plugins/php/versions/common/intl.sh
@@ -85,12 +85,10 @@ Install_lib()
 		fi
 
 		cd $sourcePath/php${version}/ext/${LIBNAME}
-		
-		OPTIONS=""
 		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
-		
+
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
 		make clean && make && make install && make clean
diff --git a/plugins/php/versions/common/phalcon.sh b/plugins/php/versions/common/phalcon.sh
index 08ee8b19f..c63deb866 100755
--- a/plugins/php/versions/common/phalcon.sh
+++ b/plugins/php/versions/common/phalcon.sh
@@ -61,6 +61,7 @@ Install_lib()
 		fi
 		cd $php_lib/${LIBNAME}-${LIBV}
 
+		OPTIONS=''
 		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
diff --git a/plugins/php/versions/common/xhprof.sh b/plugins/php/versions/common/xhprof.sh
index 78fb73195..e36936983 100755
--- a/plugins/php/versions/common/xhprof.sh
+++ b/plugins/php/versions/common/xhprof.sh
@@ -10,7 +10,7 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source/php
-
+SYS_ARCH=`arch`
 LIBNAME=xhprof
 LIBV=2.3.7
 sysName=`uname`
@@ -53,9 +53,14 @@ Install_lib()
 		fi 
 		cd $php_lib/${LIBNAME}-${LIBV}/extension
 
+		OPTIONS=''
+		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
+			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
+		fi
+
 		$serverPath/php/$version/bin/phpize
 		./configure --enable-xhprof \
-		--with-php-config=$serverPath/php/$version/bin/php-config
+		--with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
 		make clean && make && make install && make clean
 
 	fi
diff --git a/plugins/php/versions/common/yaf.sh b/plugins/php/versions/common/yaf.sh
index c6d5c538b..918491fed 100755
--- a/plugins/php/versions/common/yaf.sh
+++ b/plugins/php/versions/common/yaf.sh
@@ -10,8 +10,7 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source/php
-
-
+SYS_ARCH=`arch`
 actionType=$1
 version=$2
 
@@ -70,8 +69,13 @@ Install_lib()
 		fi 
 		cd $php_lib/${LIBNAME}-${LIBV}
 
+		OPTIONS=''
+		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
+			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
+		fi
+
 		$serverPath/php/$version/bin/phpize
-		./configure --with-php-config=$serverPath/php/$version/bin/php-config
+		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
 		make clean && make && make install && make clean
 
 	fi
diff --git a/plugins/php/versions/common/yar.sh b/plugins/php/versions/common/yar.sh
index 3ea9778cc..8861d9c01 100755
--- a/plugins/php/versions/common/yar.sh
+++ b/plugins/php/versions/common/yar.sh
@@ -10,7 +10,7 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source/php
-
+SYS_ARCH=`arch`
 actionType=$1
 version=$2
 
@@ -55,8 +55,14 @@ Install_lib()
 		fi 
 		cd $php_lib/${LIBNAME}-${LIBV}
 
+		OPTIONS=''
+		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
+			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
+		fi
+
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config \
+		$OPTIONS \
 		--with-curl=$serverPath/lib/curl
 		make clean && make && make install && make clean