From 956226e8a36ed90ab3c64625357a8d648f5a0f59 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Feb 2025 11:24:43 +0100 Subject: backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ --- php-8.0.30-icu.patch | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 php-8.0.30-icu.patch (limited to 'php-8.0.30-icu.patch') diff --git a/php-8.0.30-icu.patch b/php-8.0.30-icu.patch new file mode 100644 index 0000000..38b7b0f --- /dev/null +++ b/php-8.0.30-icu.patch @@ -0,0 +1,35 @@ +From cc46a4e6b5a413bab3e264c1dcaaf7052f54fbc4 Mon Sep 17 00:00:00 2001 +From: David Carlier +Date: Sat, 17 Feb 2024 21:38:21 +0000 +Subject: [PATCH] ext/intl: level up c++ runtime std for icu 74 and onwards. + +to align with what is required to build icu 74 itself. + +Close GH-14002 +--- + NEWS | 3 +++ + ext/intl/config.m4 | 11 ++++++++++- + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 +index dd687bcd97de3..48f5147ca7bbf 100644 +--- a/ext/intl/config.m4 ++++ b/ext/intl/config.m4 +@@ -83,7 +83,16 @@ if test "$PHP_INTL" != "no"; then + breakiterator/codepointiterator_methods.cpp" + + PHP_REQUIRE_CXX() +- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) ++ ++ AC_MSG_CHECKING([if intl requires -std=gnu++17]) ++ AS_IF([test "$PKG_CONFIG icu-uc --atleast-version=74"],[ ++ AC_MSG_RESULT([yes]) ++ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX) ++ ],[ ++ AC_MSG_RESULT([no]) ++ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) ++ ]) ++ + PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS" + case $host_alias in + *cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L" -- cgit