summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/boost-fix-icu-build.patch
blob: 556f91b8f72c3931c1c6e0fec0a2184d199734e9 (about) (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
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
Pass -std=c++11 when compiling files that include the ICU headers.  Without
this flag, compilation fails and causes Boost's build system to remove ICU
support.  Note that $(pkg-config --variable=CXXFLAGS icu-uc) includes
"-std=c++11", but Boost's build system does not use 'pkg-config'.

--- boost_1_66_0/libs/locale/build/Jamfile.v2.orig	2017-12-13 18:56:44.000000000 -0500
+++ boost_1_66_0/libs/locale/build/Jamfile.v2	2018-04-08 15:18:58.673025760 -0400
@@ -65,8 +65,8 @@
 
 if $(ICU_LINK)
 {
-    ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
-    ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
+    ICU_OPTS = <include>$(ICU_PATH)/include <cxxflags>-std=c++11 <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
+    ICU64_OPTS = <include>$(ICU_PATH)/include <cxxflags>-std=c++11 <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
 }
 else
 {
@@ -121,6 +121,7 @@
     explicit icuuc icudt icuin ;
 
     ICU_OPTS =   <include>$(ICU_PATH)/include 
+      <cxxflags>-std=c++11
       <library>icuuc/<link>shared/<runtime-link>shared 
       <library>icudt/<link>shared/<runtime-link>shared 
       <library>icuin/<link>shared/<runtime-link>shared
@@ -180,6 +181,7 @@
     explicit icuuc_64 icudt_64 icuin_64 ;
 
     ICU64_OPTS =   <include>$(ICU_PATH)/include 
+      <cxxflags>-std=c++11
       <library>icuuc_64/<link>shared/<runtime-link>shared 
       <library>icudt_64/<link>shared/<runtime-link>shared 
       <library>icuin_64/<link>shared/<runtime-link>shared
--- boost_1_66_0/libs/regex/build/Jamfile.v2.orig	2017-12-13 18:56:48.000000000 -0500
+++ boost_1_66_0/libs/regex/build/Jamfile.v2	2018-04-08 15:20:40.865532505 -0400
@@ -44,7 +44,7 @@
 
    if $(ICU_LINK)
    {
-      ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <define>BOOST_HAS_ICU=1 <runtime-link>shared ;
+      ICU_OPTS = <include>$(ICU_PATH)/include <cxxflags>-std=c++11 <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <define>BOOST_HAS_ICU=1 <runtime-link>shared ;
    }
    else
    {
@@ -78,6 +78,7 @@
 
       ICU_OPTS = 
          <include>$(ICU_PATH)/include 
+         <cxxflags>-std=c++11
          <runtime-link>shared:<library>icuuc/<link>shared
          <runtime-link>shared:<library>icudt/<link>shared
          <runtime-link>shared:<library>icuin/<link>shared