summaryrefslogtreecommitdiffstats
path: root/php-upstream.patch
blob: b9d5ca42ba43289713d42992be4db0fc19dde8f4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
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