diff options
| author | Remi Collet <remi@remirepo.net> | 2018-06-19 16:52:39 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-06-19 16:52:39 +0200 |
| commit | 7a6c9d12794ffba504797cc937424b9df3d5e623 (patch) | |
| tree | 277fb54dfd2c4b8c5c131ce03247e2e3be2f140e /php-upstream.patch | |
| parent | 19617a05378e8c31a6545da547da84afc0bdcfb7 (diff) | |
update to 7.3.0alpha2
bump php(zend-abi) and php(api) to 20180606
revert 5dd1ef90caec3021e6ce55c8554e695edf641eaf
Diffstat (limited to 'php-upstream.patch')
| -rw-r--r-- | php-upstream.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/php-upstream.patch b/php-upstream.patch new file mode 100644 index 0000000..b9d5ca4 --- /dev/null +++ b/php-upstream.patch @@ -0,0 +1,26 @@ +From 5dd1ef90caec3021e6ce55c8554e695edf641eaf Mon Sep 17 00:00:00 2001 +From: Stanislav Malyshev <stas@php.net> +Date: Sun, 17 Jun 2018 16:00:06 -0700 +Subject: [PATCH] ICU 59+ requires C++11 and errors out without the option + +--- + ext/intl/config.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 +index 52408f8..e8fad2e 100644 +--- a/ext/intl/config.m4 ++++ b/ext/intl/config.m4 +@@ -18,6 +18,9 @@ if test "$PHP_INTL" != "no"; then + else + icu_spoof_src="" + fi ++ if test "$icu_version" -ge "59000"; then ++ ICU_CXXFLAGS="$ICU_CXXFLAGS -std=c++11 -stdlib=libc++" ++ fi + PHP_NEW_EXTENSION(intl, php_intl.c \ + intl_error.c \ + intl_convert.c \ +-- +2.1.4 + |