diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-04-08 14:40:00 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-04-10 00:46:22 -0400 |
| commit | 713c975ac0aa01c224b215fcb96274b76920c90b (patch) | |
| tree | 2af909bd45bf9ddef21d64024f4b5512f6b28f0c /gnu/packages/boost.scm | |
| parent | df17d508052d955bc9800a871f403cd3f2b07fce (diff) | |
| download | guix-patches-713c975ac0aa01c224b215fcb96274b76920c90b.tar guix-patches-713c975ac0aa01c224b215fcb96274b76920c90b.tar.gz | |
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
Diffstat (limited to 'gnu/packages/boost.scm')
| -rw-r--r-- | gnu/packages/boost.scm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 674877a887..6b17e30a8e 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 <jmd@gnu.org> -;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> @@ -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) |