David Thompson <dthomps...@worcester.edu> writes:
> From: David Thompson <da...@gnu.org>
>
> * gnu/packages/boost.scm (boost)[arguments]: Extract build flags to
> #:make-flags argument.
If I understand correctly, this moves the let-bound “build-flags” to
regular make-flags and reuses the default mechanism for passing
make-flags, right?
If this is so it looks good to me.
(It’s a little hard for me to read the patch because of the indentation
change.)
~~ Ricardo
> gnu/packages/boost.scm | 80
> +++++++++++++++++++++++++-------------------------
> 1 file changed, 40 insertions(+), 40 deletions(-)
>
> diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
> index 0a644e8..882f9cc 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")
