From dd579b7e5c488c8ee215f49e9e8a77bb780e4357 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sun, 13 Aug 2023 13:33:47 +0800
Subject: [PATCH] update

---
 plugins/php/versions/common/memcache.sh  | 2 +-
 plugins/php/versions/common/memcached.sh | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/php/versions/common/memcache.sh b/plugins/php/versions/common/memcache.sh
index de007ca68..40b388b1c 100755
--- a/plugins/php/versions/common/memcache.sh
+++ b/plugins/php/versions/common/memcache.sh
@@ -55,8 +55,8 @@ Install_lib()
 		if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then
 			wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz
 			cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz
-			cd ${LIBNAME}-${LIBV}
 		fi
+		cd $php_lib/${LIBNAME}-${LIBV}
 
 		OPTIONS=""
 		if [ "${SYS_ARCH}" == "aarch64" ] && [ "$version" -lt "56" ];then
diff --git a/plugins/php/versions/common/memcached.sh b/plugins/php/versions/common/memcached.sh
index 77bc72f34..471bf2cef 100755
--- a/plugins/php/versions/common/memcached.sh
+++ b/plugins/php/versions/common/memcached.sh
@@ -10,7 +10,7 @@ rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source/php
-
+SYS_ARCH=`arch`
 LIBNAME=memcached
 LIBV=3.2.0
 sysName=`uname`
@@ -55,10 +55,16 @@ 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
+
 		# sed -i '_bak' "3237,3238s#ulong#zend_ulong#g" $php_lib/${LIBNAME}-${LIBV}/php_memcached.c
 		$serverPath/php/$version/bin/phpize
 	
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config \
+		$OPTIONS \
 		--enable-memcached \
 		--disable-memcached-sasl
 		make clean && make && make install && make clean