diff options
| author | David Thompson <davet@gnu.org> | 2016-06-08 12:07:39 -0400 |
|---|---|---|
| committer | David Thompson <davet@gnu.org> | 2016-06-14 08:50:31 -0400 |
| commit | f828ff5b148e4e083001c25d2e9c3b52c0e87da3 (patch) | |
| tree | 9351bd7c1e5922ce2e28dd78cd2a0da97e1643e2 /gnu | |
| parent | 28206a8ebfad9f6cfa786d3cfd00ee1c1dfbbc65 (diff) | |
| download | patches-f828ff5b148e4e083001c25d2e9c3b52c0e87da3.tar patches-f828ff5b148e4e083001c25d2e9c3b52c0e87da3.tar.gz | |
gnu: boost: Allow for customizable build flags.
* gnu/packages/boost.scm (boost)[arguments]: Extract build flags to #:make-flags argument.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/boost.scm | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 0a644e8940..882f9cc7c0 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -51,50 +51,50 @@ ("python" ,python-2) ("tcsh" ,tcsh))) (arguments - (let ((build-flags - `("threading=multi" "link=shared" + `(#:tests? #f + #:make-flags + (list "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") + ;; 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. - ,@(if (string-prefix? "mips64" (or (%current-target-system) - (%current-system))) - '("--without-context" - "--without-coroutine" "--without-coroutine2") - '())))) - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* '("libs/config/configure" - "libs/spirit/classic/phoenix/test/runtest.sh" - "tools/build/doc/bjam.qbk" - "tools/build/src/engine/execunix.c" - "tools/build/src/engine/Jambase" - "tools/build/src/engine/jambase.c") - (("/bin/sh") (which "sh"))) + ;; 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. + ,@(if (string-prefix? "mips64" (or (%current-target-system) + (%current-system))) + '("--without-context" + "--without-coroutine" "--without-coroutine2") + '())) + #:phases + (modify-phases %standard-phases + (replace + 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* '("libs/config/configure" + "libs/spirit/classic/phoenix/test/runtest.sh" + "tools/build/doc/bjam.qbk" + "tools/build/src/engine/execunix.c" + "tools/build/src/engine/Jambase" + "tools/build/src/engine/jambase.c") + (("/bin/sh") (which "sh"))) - (setenv "SHELL" (which "sh")) - (setenv "CONFIG_SHELL" (which "sh")) + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) - (zero? (system* "./bootstrap.sh" - (string-append "--prefix=" out) - "--with-toolset=gcc"))))) - (replace - 'build - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "./b2" ,@build-flags)))) - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "./b2" "install" ,@build-flags)))))))) + (zero? (system* "./bootstrap.sh" + (string-append "--prefix=" out) + "--with-toolset=gcc"))))) + (replace + 'build + (lambda* (#:key outputs make-flags #:allow-other-keys) + (zero? (apply system* "./b2" make-flags)))) + (replace + 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (zero? (apply system* "./b2" "install" make-flags))))))) (home-page "http://boost.org") (synopsis "Peer-reviewed portable C++ source libraries") |