nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2015-04-10 23:37:36 +02:00
parent 3314f8a7b6
commit 53a53be91b
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/boost.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -51,6 +52,11 @@
(arguments (arguments
(let ((build-flags (let ((build-flags
`("threading=multi" "link=shared" `("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 ;; Boost's 'context' library is not yet supported on mips64, so
;; we disable it. The 'coroutine' library depends on 'context', ;; we disable it. The 'coroutine' library depends on 'context',
;; so we disable that too. ;; so we disable that too.
@ -58,7 +64,8 @@
(%current-system))) (%current-system)))
'("--without-context" "--without-coroutine") '("--without-context" "--without-coroutine")
'())))) '()))))
`(#:phases `(#:tests? #f
#:phases
(alist-replace (alist-replace
'configure 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -79,18 +86,14 @@
"--with-toolset=gcc")))) "--with-toolset=gcc"))))
(alist-replace (alist-replace
'build 'build
(lambda _ (lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "./b2" ,@build-flags))) (zero? (system* "./b2" ,@build-flags)))
(alist-replace
'check
(lambda _ #t)
(alist-replace (alist-replace
'install 'install
(lambda _ (lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "./b2" "install" ,@build-flags))) (zero? (system* "./b2" "install" ,@build-flags)))
%standard-phases))))))) %standard-phases))))))
(home-page "http://boost.org") (home-page "http://boost.org")
(synopsis "Peer-reviewed portable C++ source libraries") (synopsis "Peer-reviewed portable C++ source libraries")