File tree 2 files changed +13
-1
lines changed
2 files changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -18,6 +18,9 @@ PHP NEWS
18
18
. Fixed bug GH-13563 (Setting bool values via env in FPM config fails).
19
19
(Jakub Zelenka)
20
20
21
+ - Intl:
22
+ . Fixed build for icu 74 and onwards. (dunglas)
23
+
21
24
- MySQLnd:
22
25
. Fix shift out of bounds on 32-bit non-fast-path platforms. (nielsdos)
23
26
Original file line number Diff line number Diff line change @@ -80,7 +80,16 @@ if test "$PHP_INTL" != "no"; then
80
80
breakiterator/codepointiterator_methods.cpp"
81
81
82
82
PHP_REQUIRE_CXX()
83
- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
83
+
84
+ AC_MSG_CHECKING ( [ if intl requires -std=gnu++17] )
85
+ AS_IF ( [ test "$PKG_CONFIG icu-uc --atleast-version=74"] ,[
86
+ AC_MSG_RESULT ( [ yes] )
87
+ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX)
88
+ ] ,[
89
+ AC_MSG_RESULT ( [ no] )
90
+ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
91
+ ] )
92
+
84
93
PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS"
85
94
case $host_alias in
86
95
*cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L"
You can’t perform that action at this time.
0 commit comments