From 5161e67898f354e5a4034a5b98c46bee4b9a01b6 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:36:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20PHP8=20=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=20swoole=20=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#1045)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 php8/8.0.30/build/php/extensions/install.sh | 6 +-----
 php8/8.1.27/build/php/extensions/install.sh | 6 +-----
 php8/8.2.15/build/php/extensions/install.sh | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/php8/8.0.30/build/php/extensions/install.sh b/php8/8.0.30/build/php/extensions/install.sh
index 84d2997a5..38a3b00b3 100644
--- a/php8/8.0.30/build/php/extensions/install.sh
+++ b/php8/8.0.30/build/php/extensions/install.sh
@@ -609,11 +609,7 @@ fi
 
 if [[ -z "${EXTENSIONS##*,swoole,*}" ]]; then
     echo "---------- Install swoole ----------"
-    apk add --no-cache libstdc++
-    isPhpVersionGreaterOrEqual 8 0
-    if [[ "$?" = "1" ]]; then
-        installExtensionFromTgz swoole-5.0.2 --enable-openssl --enable-http2
-    fi
+   install-php-extensions swoole
 fi
 
 if [[ -z "${EXTENSIONS##*,zip,*}" ]]; then
diff --git a/php8/8.1.27/build/php/extensions/install.sh b/php8/8.1.27/build/php/extensions/install.sh
index 84d2997a5..38a3b00b3 100644
--- a/php8/8.1.27/build/php/extensions/install.sh
+++ b/php8/8.1.27/build/php/extensions/install.sh
@@ -609,11 +609,7 @@ fi
 
 if [[ -z "${EXTENSIONS##*,swoole,*}" ]]; then
     echo "---------- Install swoole ----------"
-    apk add --no-cache libstdc++
-    isPhpVersionGreaterOrEqual 8 0
-    if [[ "$?" = "1" ]]; then
-        installExtensionFromTgz swoole-5.0.2 --enable-openssl --enable-http2
-    fi
+   install-php-extensions swoole
 fi
 
 if [[ -z "${EXTENSIONS##*,zip,*}" ]]; then
diff --git a/php8/8.2.15/build/php/extensions/install.sh b/php8/8.2.15/build/php/extensions/install.sh
index 84d2997a5..38a3b00b3 100644
--- a/php8/8.2.15/build/php/extensions/install.sh
+++ b/php8/8.2.15/build/php/extensions/install.sh
@@ -609,11 +609,7 @@ fi
 
 if [[ -z "${EXTENSIONS##*,swoole,*}" ]]; then
     echo "---------- Install swoole ----------"
-    apk add --no-cache libstdc++
-    isPhpVersionGreaterOrEqual 8 0
-    if [[ "$?" = "1" ]]; then
-        installExtensionFromTgz swoole-5.0.2 --enable-openssl --enable-http2
-    fi
+   install-php-extensions swoole
 fi
 
 if [[ -z "${EXTENSIONS##*,zip,*}" ]]; then