HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 713c975a MW |
1 | Pass -std=c++11 when compiling files that include the ICU headers. Without |
| 2 | this flag, compilation fails and causes Boost's build system to remove ICU | |
| 3 | support. Note that $(pkg-config --variable=CXXFLAGS icu-uc) includes | |
| 4 | "-std=c++11", but Boost's build system does not use 'pkg-config'. | |
| 5 | ||
| 6 | --- boost_1_66_0/libs/locale/build/Jamfile.v2.orig 2017-12-13 18:56:44.000000000 -0500 | |
| 7 | +++ boost_1_66_0/libs/locale/build/Jamfile.v2 2018-04-08 15:18:58.673025760 -0400 | |
| 8 | @@ -65,8 +65,8 @@ | |
| 9 | ||
| 10 | if $(ICU_LINK) | |
| 11 | { | |
| 12 | - ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ; | |
| 13 | - ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ; | |
| 14 | + ICU_OPTS = <include>$(ICU_PATH)/include <cxxflags>-std=c++11 <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ; | |
| 15 | + ICU64_OPTS = <include>$(ICU_PATH)/include <cxxflags>-std=c++11 <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ; | |
| 16 | } | |
| 17 | else | |
| 18 | { | |
| 19 | @@ -121,6 +121,7 @@ | |
| 20 | explicit icuuc icudt icuin ; | |
| 21 | ||
| 22 | ICU_OPTS = <include>$(ICU_PATH)/include | |
| 23 | + <cxxflags>-std=c++11 | |
| 24 | <library>icuuc/<link>shared/<runtime-link>shared | |
| 25 | <library>icudt/<link>shared/<runtime-link>shared | |
| 26 | <library>icuin/<link>shared/<runtime-link>shared | |
| 27 | @@ -180,6 +181,7 @@ | |
| 28 | explicit icuuc_64 icudt_64 icuin_64 ; | |
| 29 | ||
| 30 | ICU64_OPTS = <include>$(ICU_PATH)/include | |
| 31 | + <cxxflags>-std=c++11 | |
| 32 | <library>icuuc_64/<link>shared/<runtime-link>shared | |
| 33 | <library>icudt_64/<link>shared/<runtime-link>shared | |
| 34 | <library>icuin_64/<link>shared/<runtime-link>shared | |
| 35 | --- boost_1_66_0/libs/regex/build/Jamfile.v2.orig 2017-12-13 18:56:48.000000000 -0500 | |
| 36 | +++ boost_1_66_0/libs/regex/build/Jamfile.v2 2018-04-08 15:20:40.865532505 -0400 | |
| 37 | @@ -44,7 +44,7 @@ | |
| 38 | ||
| 39 | if $(ICU_LINK) | |
| 40 | { | |
| 41 | - ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <define>BOOST_HAS_ICU=1 <runtime-link>shared ; | |
| 42 | + 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 ; | |
| 43 | } | |
| 44 | else | |
| 45 | { | |
| 46 | @@ -78,6 +78,7 @@ | |
| 47 | ||
| 48 | ICU_OPTS = | |
| 49 | <include>$(ICU_PATH)/include | |
| 50 | + <cxxflags>-std=c++11 | |
| 51 | <runtime-link>shared:<library>icuuc/<link>shared | |
| 52 | <runtime-link>shared:<library>icudt/<link>shared | |
| 53 | <runtime-link>shared:<library>icuin/<link>shared |