diff options
author | Remi Collet <remi@remirepo.net> | 2025-02-13 14:08:01 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2025-02-13 14:08:01 +0100 |
commit | d550df3eed2ae0260c7d62f5bb607b3bda1416e5 (patch) | |
tree | 8b063ac59898803d998063b92f4c3e0541176c49 /php-7.4.33-icu.patch | |
parent | 07be9faa56fa2a2c56390e0949f4ae0d4403c18c (diff) |
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+
backport fix for ICU 74+
Diffstat (limited to 'php-7.4.33-icu.patch')
-rw-r--r-- | php-7.4.33-icu.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/php-7.4.33-icu.patch b/php-7.4.33-icu.patch new file mode 100644 index 0000000..48940fd --- /dev/null +++ b/php-7.4.33-icu.patch @@ -0,0 +1,35 @@ +From cc46a4e6b5a413bab3e264c1dcaaf7052f54fbc4 Mon Sep 17 00:00:00 2001 +From: David Carlier <devnexen@gmail.com> +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" + if test "$ext_shared" = "no"; then + PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS) |