Try to fix support for icu 75.1

shivammathur · Sep 11, 2024 · 881a52b · 881a52b
1 parent 6775955
commit 881a52b
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 41 deletions.
diff --git a/patches/intl/intl-icu-75.1-php7.1-8.0.patch b/patches/intl/intl-icu-75.1-php7.1-8.0.patch
diff --git a/patches/intl/series-php5.6 b/patches/intl/series-php5.6
@@ -5,5 +5,4 @@ intl-icu-73.1-php5.6-8.0.patch
 intl-icu-73.2-php5.6-8.0.patch
 intl-icu-74.1-php5.6-8.0.patch
 intl-icu-74.2-php5.6-8.0.patch
-intl-icu-75.1-php5.6-7.0.patch
 intl-icu-75.1-php5.6-8.0.patch
diff --git a/patches/intl/series-php7.1 b/patches/intl/series-php7.1
@@ -5,5 +5,4 @@ intl-icu-73.1-php5.6-8.0.patch
 intl-icu-73.2-php5.6-8.0.patch
 intl-icu-74.1-php5.6-8.0.patch
 intl-icu-74.2-php5.6-8.0.patch
-intl-icu-75.1-php7.1-8.0.patch
 intl-icu-75.1-php5.6-8.0.patch
diff --git a/patches/intl/series-php7.2 b/patches/intl/series-php7.2
@@ -5,5 +5,4 @@ intl-icu-73.1-php5.6-8.0.patch
 intl-icu-73.2-php5.6-8.0.patch
 intl-icu-74.1-php5.6-8.0.patch
 intl-icu-74.2-php5.6-8.0.patch
-intl-icu-75.1-php7.1-8.0.patch
 intl-icu-75.1-php5.6-8.0.patch
diff --git a/patches/intl/series-php7.3 b/patches/intl/series-php7.3
@@ -5,5 +5,4 @@ intl-icu-73.1-php5.6-8.0.patch
 intl-icu-73.2-php5.6-8.0.patch
 intl-icu-74.1-php5.6-8.0.patch
 intl-icu-74.2-php5.6-8.0.patch
-intl-icu-75.1-php7.1-8.0.patch
 intl-icu-75.1-php5.6-8.0.patch
diff --git a/patches/intl/series-php7.4 b/patches/intl/series-php7.4
@@ -6,4 +6,3 @@ intl-icu-73.2-php5.6-8.0.patch
 intl-icu-74.1-php5.6-8.0.patch
 intl-icu-74.2-php5.6-8.0.patch
 intl-icu-75.1-php7.4-8.1.patch
-intl-icu-75.1-php5.6-8.0.patch
diff --git a/src/build-intl.sh b/src/build-intl.sh
@@ -46,11 +46,12 @@ install_intl() {
     while read patch || [[ $patch ]]; do
       [[ "$patch" =~ $ICU ]] && patch -d /tmp/php-src -N -p1 -s < "patches/intl/$patch"
     done < patches/intl/series-php"$VERSION"
-    cd "/tmp/php-src/ext/intl" || exit 1    
+    cd "/tmp/php-src/ext/intl" || exit 1
     phpize && sudo ./configure --with-php-config="$(command -v php-config)" --enable-intl
     echo "#define FALSE 0" >> config.h
     echo "#define TRUE 1" >> config.h
-    make CXXFLAGS="-O2 -std=c++11 -DU_USING_ICU_NAMESPACE=1 -DTRUE=1 -DFALSE=0 $CXXFLAGS"
+    [[ "${ICU%.*}" -ge 75 ]] && CXX=17 || CXX=11
+    make CXXFLAGS="-O2 -std=c++$CXX -DU_USING_ICU_NAMESPACE=1 -DTRUE=1 -DFALSE=0 $CXXFLAGS"
     sudo cp ./modules/* "$ext_dir/"
     enable_extension intl extension
   )