diff options
| author | Anatol Belski <ab@php.net> | 2018-03-30 14:16:44 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-03-30 14:16:44 +0200 |
| commit | 35e3d597f529eedf76711630d0f3b31426ba9b83 (patch) | |
| tree | bb820ab15ea7c52bc1165a891e1abe9997bd1669 | |
| parent | 99194d18310634ed84d3449585159c68a0615294 (diff) | |
| parent | 8b104d789317d96f6d3e23e635f0ca288c0a23ee (diff) | |
| download | php-git-35e3d597f529eedf76711630d0f3b31426ba9b83.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix clang build, ref buf #76153
| -rw-r--r-- | ext/intl/config.m4 | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 index a496d8d70c..aea57102f6 100644 --- a/ext/intl/config.m4 +++ b/ext/intl/config.m4 @@ -20,7 +20,6 @@ if test "$PHP_INTL" != "no"; then PHP_NEW_EXTENSION(intl, php_intl.c \ intl_error.c \ intl_convert.c \ - intl_convertcpp.cpp \ collator/collator.c \ collator/collator_class.c \ collator/collator_sort.c \ @@ -32,8 +31,6 @@ if test "$PHP_INTL" != "no"; then collator/collator_is_numeric.c \ collator/collator_error.c \ common/common_error.c \ - common/common_enum.cpp \ - common/common_date.cpp \ converter/converter.c \ formatter/formatter.c \ formatter/formatter_main.c \ @@ -53,17 +50,12 @@ if test "$PHP_INTL" != "no"; then dateformat/dateformat_attr.c \ dateformat/dateformat_data.c \ dateformat/dateformat_format.c \ - dateformat/dateformat_format_object.cpp \ dateformat/dateformat_parse.c \ - dateformat/dateformat_create.cpp \ - dateformat/dateformat_attrcpp.cpp \ - dateformat/dateformat_helpers.cpp \ msgformat/msgformat.c \ msgformat/msgformat_attr.c \ msgformat/msgformat_class.c \ msgformat/msgformat_data.c \ msgformat/msgformat_format.c \ - msgformat/msgformat_helpers.cpp \ msgformat/msgformat_parse.c \ grapheme/grapheme_string.c \ grapheme/grapheme_util.c \ @@ -73,6 +65,18 @@ if test "$PHP_INTL" != "no"; then transliterator/transliterator.c \ transliterator/transliterator_class.c \ 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) + + PHP_ADD_SOURCES(PHP_EXT_DIR(intl), intl_convertcpp.cpp \ + common/common_enum.cpp \ + common/common_date.cpp \ + dateformat/dateformat_format_object.cpp \ + dateformat/dateformat_create.cpp \ + dateformat/dateformat_attrcpp.cpp \ + dateformat/dateformat_helpers.cpp \ + msgformat/msgformat_helpers.cpp \ timezone/timezone_class.cpp \ timezone/timezone_methods.cpp \ calendar/calendar_class.cpp \ @@ -83,10 +87,9 @@ if test "$PHP_INTL" != "no"; then breakiterator/breakiterator_methods.cpp \ breakiterator/rulebasedbreakiterator_methods.cpp \ breakiterator/codepointiterator_internal.cpp \ - breakiterator/codepointiterator_methods.cpp \ - 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 $ICU_EXTRA_FLAGS,cxx) + breakiterator/codepointiterator_methods.cpp, \ + $ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $ICU_EXTRA_FLAGS) + PHP_ADD_BUILD_DIR($ext_builddir/collator) PHP_ADD_BUILD_DIR($ext_builddir/converter) PHP_ADD_BUILD_DIR($ext_builddir/common) |