diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2016-09-26 12:08:13 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2016-09-26 14:30:57 +0200 |
| commit | 7f5ca399bfe43c32f3a61acb2b7440737e7bbcc5 (patch) | |
| tree | 1bb02cd5b306e5a9457c978ef95caab3f8f4a16b /gnu/packages/tbb.scm | |
| parent | af8de20386bc38305ca653becdfb260d3a9a39de (diff) | |
| download | gnu-guix-7f5ca399bfe43c32f3a61acb2b7440737e7bbcc5.tar gnu-guix-7f5ca399bfe43c32f3a61acb2b7440737e7bbcc5.tar.gz | |
gnu: tbb: Use modify-phases syntax.
* gnu/packages/tbb.scm (tbb)[arguments]: Use "modify-phases" syntax.
Diffstat (limited to 'gnu/packages/tbb.scm')
| -rw-r--r-- | gnu/packages/tbb.scm | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm index c19391abfb..eab51f8a1e 100644 --- a/gnu/packages/tbb.scm +++ b/gnu/packages/tbb.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; ;;; This file is part of GNU Guix. @@ -49,35 +49,34 @@ `(#:test-target "test" #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) - #:phases (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "build/linux.gcc.inc" - (("LIB_LINK_FLAGS =") - (string-append "LIB_LINK_FLAGS = -Wl,-rpath=" - (assoc-ref outputs "out") "/lib")))) - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((doc (string-append - (assoc-ref outputs "doc") "/doc")) - (examples (string-append doc "/examples")) - (lib (string-append - (assoc-ref outputs "out") "/lib")) - (include (string-append - (assoc-ref outputs "out") "/include"))) - (mkdir-p lib) - (for-each - (lambda (f) - (copy-file f - (string-append lib "/" - (basename f)))) - (find-files "build/guix_release" "\\.so")) - (copy-recursively "doc" doc) - (copy-recursively "examples" examples) - (copy-recursively "include" include) - #t)) - %standard-phases)))) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "build/linux.gcc.inc" + (("LIB_LINK_FLAGS =") + (string-append "LIB_LINK_FLAGS = -Wl,-rpath=" + (assoc-ref outputs "out") "/lib"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((doc (string-append + (assoc-ref outputs "doc") "/doc")) + (examples (string-append doc "/examples")) + (lib (string-append + (assoc-ref outputs "out") "/lib")) + (include (string-append + (assoc-ref outputs "out") "/include"))) + (mkdir-p lib) + (for-each + (lambda (f) + (copy-file f + (string-append lib "/" + (basename f)))) + (find-files "build/guix_release" "\\.so")) + (copy-recursively "doc" doc) + (copy-recursively "examples" examples) + (copy-recursively "include" include) + #t)))))) (home-page "https://www.threadingbuildingblocks.org") (synopsis "C++ library for parallel programming") (description |