diff options
author | Mark H Weaver <mhw@netris.org> | 2015-04-17 22:06:05 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 22:06:05 -0400 |
commit | 334345d9db53326fa062298e2372d6c33123949a (patch) | |
tree | 50774c171f1a348bd7de8e9a447bad2a14a9dffb /gnu/packages/boost.scm | |
parent | 8d7dc5d9dbf009009d33e21598f92c4685965cd5 (diff) | |
parent | 09dd019490e4a269b0a2d9512a07688f8ee657d3 (diff) | |
download | guix-334345d9db53326fa062298e2372d6c33123949a.tar guix-334345d9db53326fa062298e2372d6c33123949a.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/boost.scm')
-rw-r--r-- | gnu/packages/boost.scm | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 24fc53d0b8..10c88f3f2a 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,6 +52,11 @@ (arguments (let ((build-flags `("threading=multi" "link=shared" + + ;; Set the RUNPATH to $libdir so that the libs find each other. + (string-append "linkflags=-Wl,-rpath=" + (assoc-ref outputs "out") "/lib") + ;; Boost's 'context' library is not yet supported on mips64, so ;; we disable it. The 'coroutine' library depends on 'context', ;; so we disable that too. @@ -58,7 +64,8 @@ (%current-system))) '("--without-context" "--without-coroutine") '())))) - `(#:phases + `(#:tests? #f + #:phases (alist-replace 'configure (lambda* (#:key outputs #:allow-other-keys) @@ -79,18 +86,14 @@ "--with-toolset=gcc")))) (alist-replace 'build - (lambda _ + (lambda* (#:key outputs #:allow-other-keys) (zero? (system* "./b2" ,@build-flags))) (alist-replace - 'check - (lambda _ #t) - - (alist-replace - 'install - (lambda _ - (zero? (system* "./b2" "install" ,@build-flags))) - %standard-phases))))))) + 'install + (lambda* (#:key outputs #:allow-other-keys) + (zero? (system* "./b2" "install" ,@build-flags))) + %standard-phases)))))) (home-page "http://boost.org") (synopsis "Peer-reviewed portable C++ source libraries") |