Contents of /trunk/php/patches/php-5.6.38-icu61.patch
Parent Directory | Revision Log
Revision 3237 -
(show annotations)
(download)
Mon Oct 29 13:19:05 2018 UTC (5 years, 11 months ago) by niro
File size: 1723 byte(s)
Mon Oct 29 13:19:05 2018 UTC (5 years, 11 months ago) by niro
File size: 1723 byte(s)
-added php-5.6.38-icu61.patch
1 | diff -Naur php-5.6.38/acinclude.m4 php-5.6.38-icu-61.1/acinclude.m4 |
2 | --- php-5.6.38/acinclude.m4 2018-09-12 00:12:36.000000000 +0200 |
3 | +++ php-5.6.38-icu-61.1/acinclude.m4 2018-10-29 14:13:27.361534483 +0100 |
4 | @@ -2244,6 +2244,9 @@ |
5 | ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` |
6 | PHP_EVAL_INCLINE($ICU_INCS) |
7 | PHP_EVAL_LIBLINE($ICU_LIBS, $1) |
8 | + |
9 | + ICU_EXTRA_FLAGS=`$ICU_CONFIG --cxxflags` |
10 | + ICU_EXTRA_FLAGS="$ICU_EXTRA_FLAGS -DU_USING_ICU_NAMESPACE=1" |
11 | fi |
12 | ]) |
13 | |
14 | diff -Naur php-5.6.38/ext/intl/config.m4 php-5.6.38-icu-61.1/ext/intl/config.m4 |
15 | --- php-5.6.38/ext/intl/config.m4 2018-09-12 00:12:36.000000000 +0200 |
16 | +++ php-5.6.38-icu-61.1/ext/intl/config.m4 2018-10-29 14:14:34.845610037 +0100 |
17 | @@ -85,7 +85,7 @@ |
18 | breakiterator/codepointiterator_internal.cpp \ |
19 | breakiterator/codepointiterator_methods.cpp \ |
20 | idn/idn.c \ |
21 | - $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings) |
22 | + $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings $ICU_EXTRA_FLAGS) |
23 | PHP_ADD_BUILD_DIR($ext_builddir/collator) |
24 | PHP_ADD_BUILD_DIR($ext_builddir/converter) |
25 | PHP_ADD_BUILD_DIR($ext_builddir/common) |
26 | diff -Naur php-5.6.38/ext/intl/config.w32 php-5.6.38-icu-61.1/ext/intl/config.w32 |
27 | --- php-5.6.38/ext/intl/config.w32 2018-09-12 00:12:36.000000000 +0200 |
28 | +++ php-5.6.38-icu-61.1/ext/intl/config.w32 2018-10-29 14:15:03.394218951 +0100 |
29 | @@ -118,7 +118,7 @@ |
30 | "intl"); |
31 | |
32 | ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib icule.lib iculx.lib"); |
33 | - ADD_FLAG("CFLAGS_INTL", "/EHsc"); |
34 | + ADD_FLAG("CFLAGS_INTL", "/EHsc /D U_USING_ICU_NAMESPACE=1"); |
35 | AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled"); |
36 | } else { |
37 | WARNING("intl not enabled; libraries and/or headers not found"); |