Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix erroneous dnl appended in configure #14013

Merged
merged 2 commits into from
Apr 21, 2024
Merged

Fix erroneous dnl appended in configure #14013

merged 2 commits into from
Apr 21, 2024

Conversation

petk
Copy link
Member

@petk petk commented Apr 20, 2024

This is a backport of commit 03f1553 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.

The configure script diff before and after:

47520,47521c47520
<       ax_cxx_compile_alternatives="17 1z"  ax_cxx_compile_cxx17_required=truednl
<   ac_ext=cpp
---
>       ax_cxx_compile_alternatives="17 1z"  ax_cxx_compile_cxx17_required=true  ac_ext=cpp
48373,48374c48372
<       ax_cxx_compile_alternatives="11 0x"  ax_cxx_compile_cxx11_required=truednl
<   ac_ext=cpp
---
>       ax_cxx_compile_alternatives="11 0x"  ax_cxx_compile_cxx11_required=true  ac_ext=cpp

@petk
Fix erroneous dnl appended in configure
f61fbf5 
This is a backport of commit 03f1553 to
PHP-8.2 due to phpGH-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.
@petk
Copy link
Member Author

petk commented Apr 21, 2024

In the appended commit, I've added a note in NEWS file.

@petk petk merged commit 7d3d8de into php:PHP-8.2 Apr 21, 2024
2 checks passed
petk added a commit that referenced this pull request Apr 21, 2024
@petk
Merge branch 'PHP-8.2' into PHP-8.3
f28ddec 
* PHP-8.2:
  Fix erroneous dnl appended in configure (#14013)
petk added a commit that referenced this pull request Apr 21, 2024
@petk
Merge branch 'PHP-8.3'
7151855 
* PHP-8.3:
  Fix erroneous dnl appended in configure (#14013)
@petk petk deleted the patch-php-82-php-cxx-compile-stdcxx branch April 21, 2024 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@devnexen devnexen devnexen approved these changes

Assignees
No one assigned
Labels
Category: Build System
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@petk @devnexen