diff options
| author | Anatol Belski <ab@php.net> | 2018-04-05 16:45:41 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-04-05 16:45:41 +0200 |
| commit | e01f88df7cf74355caf5db31b778721a50bd3d22 (patch) | |
| tree | ea2a3372e6b44940c1f299610556cb70f03ffe9e | |
| parent | 7768f5e2decfed03515f4bc7cdb3536a3c575a52 (diff) | |
| parent | 09d7ffabcd99fe9b99c4206f321fecc506635072 (diff) | |
| download | php-git-e01f88df7cf74355caf5db31b778721a50bd3d22.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Group common flags
| -rw-r--r-- | ext/intl/config.m4 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 index e8428e1cbb..52408f8e91 100644 --- a/ext/intl/config.m4 +++ b/ext/intl/config.m4 @@ -9,6 +9,7 @@ if test "$PHP_INTL" != "no"; then PHP_SETUP_ICU(INTL_SHARED_LIBADD) PHP_SUBST(INTL_SHARED_LIBADD) PHP_REQUIRE_CXX() + INTL_COMMON_FLAGS="$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" if test "$icu_version" -ge "4002"; then icu_spoof_src=" spoofchecker/spoofchecker_class.c \ spoofchecker/spoofchecker.c\ @@ -67,9 +68,9 @@ if test "$PHP_INTL" != "no"; then transliterator/transliterator_methods.c \ uchar/uchar.c \ idn/idn.c \ - $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,cxx) + $icu_spoof_src, $ext_shared,,$INTL_COMMON_FLAGS,cxx) - PHP_INTL_CPP_SOURCES="intl_convertcpp.cpp \ + PHP_INTL_CXX_SOURCES="intl_convertcpp.cpp \ common/common_enum.cpp \ common/common_date.cpp \ dateformat/dateformat_format_object.cpp \ @@ -88,11 +89,11 @@ if test "$PHP_INTL" != "no"; then breakiterator/rulebasedbreakiterator_methods.cpp \ breakiterator/codepointiterator_internal.cpp \ breakiterator/codepointiterator_methods.cpp" - PHP_INTL_CPP_FLAGS="$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $ICU_CXXFLAGS" + PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $ICU_CXXFLAGS" if test "$ext_shared" = "no"; then - PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS) + PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS) else - PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS, shared_objects_intl, yes) + PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS, shared_objects_intl, yes) fi PHP_ADD_BUILD_DIR($ext_builddir/collator) |