From 62a9ef1337010771c9f79c64e7b84a855c45df1f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 8 Apr 2018 14:40:00 -0400 Subject: [PATCH] gnu: boost: Fix ICU support. * gnu/packages/patches/boost-fix-icu-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/boost.scm (boost)[source]: Add the patch. [arguments]: In the custom configure phase, pass --with-icu=... to ./bootstrap.sh --- gnu/local.mk | 1 + gnu/packages/boost.scm | 13 ++++-- gnu/packages/patches/boost-fix-icu-build.patch | 59 ++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/boost-fix-icu-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6cf49ad07..5888d32f5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -577,6 +577,7 @@ dist_patch_DATA = \ %D%/packages/patches/bcftools-regidx-unsigned-char.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blast+-fix-makefile.patch \ + %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/btrfs-progs-e-value-block.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/cairo-CVE-2016-9082.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 674877a88..6b17e30a8 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington -;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2015 Ludovic Courtès @@ -52,7 +52,8 @@ ".tar.bz2")) (sha256 (base32 - "1aaw48cmimsskzgiclwn0iifp62a5iw9cbqrhfari876af1828ap")))) + "1aaw48cmimsskzgiclwn0iifp62a5iw9cbqrhfari876af1828ap")) + (patches (search-patches "boost-fix-icu-build.patch")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) ("zlib" ,zlib))) @@ -81,8 +82,9 @@ (modify-phases %standard-phases (delete 'bootstrap) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((icu (assoc-ref inputs "icu4c")) + (out (assoc-ref outputs "out"))) (substitute* '("libs/config/configure" "libs/spirit/classic/phoenix/test/runtest.sh" "tools/build/doc/bjam.qbk" @@ -96,6 +98,9 @@ (invoke "./bootstrap.sh" (string-append "--prefix=" out) + ;; Auto-detection looks for ICU only in traditional + ;; install locations. + (string-append "--with-icu=" icu) "--with-toolset=gcc")))) (replace 'build (lambda* (#:key make-flags #:allow-other-keys) diff --git a/gnu/packages/patches/boost-fix-icu-build.patch b/gnu/packages/patches/boost-fix-icu-build.patch new file mode 100644 index 000000000..389f60e30 --- /dev/null +++ b/gnu/packages/patches/boost-fix-icu-build.patch @@ -0,0 +1,59 @@ +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 14:13:17.953484787 -0400 +@@ -65,8 +65,8 @@ + + if $(ICU_LINK) + { +- ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin shared ; +- ICU64_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin64 shared ; ++ ICU_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin shared ; ++ ICU64_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin64 shared ; + } + else + { +@@ -120,7 +120,8 @@ + + explicit icuuc icudt icuin ; + +- ICU_OPTS = $(ICU_PATH)/include ++ ICU_OPTS = $(ICU_PATH)/include ++ -std=c++11 + icuuc/shared/shared + icudt/shared/shared + icuin/shared/shared +@@ -179,7 +180,8 @@ + + explicit icuuc_64 icudt_64 icuin_64 ; + +- ICU64_OPTS = $(ICU_PATH)/include ++ ICU64_OPTS = $(ICU_PATH)/include ++ -std=c++11 + icuuc_64/shared/shared + icudt_64/shared/shared + icuin_64/shared/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 14:11:56.405080410 -0400 +@@ -44,7 +44,7 @@ + + if $(ICU_LINK) + { +- ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin BOOST_HAS_ICU=1 shared ; ++ ICU_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin BOOST_HAS_ICU=1 shared ; + } + else + { +@@ -77,7 +77,8 @@ + lib icuin : : this_is_an_invalid_library_name ; + + ICU_OPTS = +- $(ICU_PATH)/include ++ $(ICU_PATH)/include ++ -std=c++11 + shared:icuuc/shared + shared:icudt/shared + shared:icuin/shared -- 2.16.3