From f61fbf5fafb52d9fe6ce3b52fa0411613c5f4211 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 20 Apr 2024 02:22:22 +0200 Subject: [PATCH 1/2] Fix erroneous dnl appended in configure This is a backport of commit 03f15534a17c7031b89dac7aaa21d59474517321 to PHP-8.2 due to GH-14002 and fixes the PHP_CXX_COMPILE_STDCXX check in ext/intl whether the specified C++ standard is mandatory or optional. The `dnl` (Discard to Next Line) M4 macro in this combination of `m4_if` macros and arguments isn't properly replaced and a literal `dnl` string is appended in the configure script. The `[]dnl` works ok. --- build/php_cxx_compile_stdcxx.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/php_cxx_compile_stdcxx.m4 b/build/php_cxx_compile_stdcxx.m4 index f8e97fce708f0..8f723266b2c4f 100644 --- a/build/php_cxx_compile_stdcxx.m4 +++ b/build/php_cxx_compile_stdcxx.m4 @@ -27,11 +27,11 @@ AC_DEFUN([PHP_CXX_COMPILE_STDCXX], [dnl [$1], [14], [ax_cxx_compile_alternatives="14 1y"], [$1], [17], [ax_cxx_compile_alternatives="17 1z"], [$1], [20], [ax_cxx_compile_alternatives="20"], - [m4_fatal([invalid first argument `$1' to PHP_CXX_COMPILE_STDCXX])])dnl + [m4_fatal([invalid first argument `$1' to PHP_CXX_COMPILE_STDCXX])])[]dnl m4_if([$2], [], [ax_cxx_compile_cxx$1_required=true], [$2], [mandatory], [ax_cxx_compile_cxx$1_required=true], [$2], [optional], [ax_cxx_compile_cxx$1_required=false], - [m4_fatal([invalid third argument `$2' to PHP_CXX_COMPILE_STDCXX])])dnl + [m4_fatal([invalid third argument `$2' to PHP_CXX_COMPILE_STDCXX])])[]dnl AC_LANG_PUSH([C++])dnl ac_success=no From c54c4f459171035741f57898b0c5473b3332f853 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 21 Apr 2024 17:07:42 +0200 Subject: [PATCH 2/2] [skip ci] Add note to NEWS --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 0cc2d50baf281..33bbf62fca8bb 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ PHP NEWS other timeout implementations). (Kévin Dunglas) . Fixed bug GH-14003 (Broken cleanup of unfinished calls with callable convert parameters). (ilutov) + . Fixed bug GH-14013 (Erroneous dnl appended in configure). (Peter Kokot) - Fibers: . Fixed bug GH-13903 (ASAN false positive underflow when executing copy()).