ext/intl: level up c++ runtime std for icu 74 and onwards.#13422
Closed
devnexen wants to merge 1 commit intophp:masterfrom
Closed
ext/intl: level up c++ runtime std for icu 74 and onwards.#13422devnexen wants to merge 1 commit intophp:masterfrom
devnexen wants to merge 1 commit intophp:masterfrom
Conversation
devnexen
force-pushed
the
ext_intl_updforicu74
branch
from
f141194 to
64ee9a0
Compare
petk
reviewed
Feb 18, 2024
ext/intl/config.m4
Outdated
Comment on lines
+85
to
+91
| AC_RUN_IFELSE([AC_LANG_SOURCE([[ | ||
| #include <unicode/uvernum.h> | ||
|
|
||
| int main(int argc, char *argv[]) | ||
| { | ||
| #if U_ICU_VERSION_MAJOR_NUM >= 74 | ||
| return 0; | ||
| #else | ||
| return 1; | ||
| #endif | ||
| } | ||
| ]])],[ | ||
| 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) | ||
| ], [ | ||
| ]) |
Member
There was a problem hiding this comment.
Suggested change
| AC_RUN_IFELSE([AC_LANG_SOURCE([[ | |
| #include <unicode/uvernum.h> | |
| int main(int argc, char *argv[]) | |
| { | |
| #if U_ICU_VERSION_MAJOR_NUM >= 74 | |
| return 0; | |
| #else | |
| return 1; | |
| #endif | |
| } | |
| ]])],[ | |
| 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) | |
| ], [ | |
| ]) | |
| 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) | |
| ]) |
Perhaps instead of running the test program, this can be checked directly from the package.
Otherwise, also something like this can be done:
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <unicode/uvernum.h>],[[
#if U_ICU_VERSION_MAJOR_NUM >= 74
return 0;
#else
# error "ICU version < 74"
#endif
]])],[
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)
])
to align with what is required to build icu 74 itself.
devnexen
force-pushed
the
ext_intl_updforicu74
branch
from
64ee9a0 to
65f37e1
Compare
Member
Author
|
ping :) |
petk
approved these changes
Feb 20, 2024
dunglas
pushed a commit
to dunglas/php-src
that referenced
this pull request
Apr 19, 2024
to align with what is required to build icu 74 itself. Close phpGH-13422.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
to align with what is required to build icu 74 itself.