php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source
This commit is contained in:
David Carlier
2024-04-19 10:07:11 +01:00
parent dd5cdfd645 cc46a4e6b5
commit e94f3a7b40
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -24,6 +24,9 @@ PHP NEWS
. Fixed bug GH-13563 (Setting bool values via env in FPM config fails).
(Jakub Zelenka)
- Intl:
. Fixed build for icu 74 and onwards. (dunglas)
- MySQLnd:
. Fix shift out of bounds on 32-bit non-fast-path platforms. (nielsdos)

11
ext/intl/config.m4
View File

@@ -80,7 +80,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"