diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-04-10 23:37:36 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-04-10 23:37:36 +0200 |
| commit | 53a53be91b7daf4d6b23bd3b31ed0a83baf40c73 (patch) | |
| tree | e6a89caad47d2db71d892ebe5c8846330539d4d4 /gnu/packages | |
| parent | 3314f8a7b6e92ba77a1706251703f1783d456824 (diff) | |
| download | guix-53a53be91b7daf4d6b23bd3b31ed0a83baf40c73.tar guix-53a53be91b7daf4d6b23bd3b31ed0a83baf40c73.tar.gz | |
gnu: boost: Add $libdir to the RUNPATH of libraries.
* gnu/packages/boost.scm (boost)[arguments]: Add -Wl,-rpath=... to
BUILD-FLAGS. Remove 'check' phase and use #:tests? #f instead.
Diffstat (limited to 'gnu/packages')
| -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") |