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

gnu: tbb: Use modify-phases syntax. 

* gnu/packages/tbb.scm (tbb)[arguments]: Use "modify-phases" syntax.
master
Ricardo Wurmus 2016-09-26 12:08:13 +02:00
parent af8de20386
commit 7f5ca399bf
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
gnu/packages/tbb.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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> ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -49,35 +49,34 @@
`(#:test-target "test" `(#:test-target "test"
#:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib")) (assoc-ref %outputs "out") "/lib"))
#:phases (alist-replace #:phases
'configure (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (replace 'configure
(substitute* "build/linux.gcc.inc" (lambda* (#:key outputs #:allow-other-keys)
(("LIB_LINK_FLAGS =") (substitute* "build/linux.gcc.inc"
(string-append "LIB_LINK_FLAGS = -Wl,-rpath=" (("LIB_LINK_FLAGS =")
(assoc-ref outputs "out") "/lib")))) (string-append "LIB_LINK_FLAGS = -Wl,-rpath="
(alist-replace (assoc-ref outputs "out") "/lib")))))
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((doc (string-append (let* ((doc (string-append
(assoc-ref outputs "doc") "/doc")) (assoc-ref outputs "doc") "/doc"))
(examples (string-append doc "/examples")) (examples (string-append doc "/examples"))
(lib (string-append (lib (string-append
(assoc-ref outputs "out") "/lib")) (assoc-ref outputs "out") "/lib"))
(include (string-append (include (string-append
(assoc-ref outputs "out") "/include"))) (assoc-ref outputs "out") "/include")))
(mkdir-p lib) (mkdir-p lib)
(for-each (for-each
(lambda (f) (lambda (f)
(copy-file f (copy-file f
(string-append lib "/" (string-append lib "/"
(basename f)))) (basename f))))
(find-files "build/guix_release" "\\.so")) (find-files "build/guix_release" "\\.so"))
(copy-recursively "doc" doc) (copy-recursively "doc" doc)
(copy-recursively "examples" examples) (copy-recursively "examples" examples)
(copy-recursively "include" include) (copy-recursively "include" include)
#t)) #t))))))
%standard-phases))))
(home-page "https://www.threadingbuildingblocks.org") (home-page "https://www.threadingbuildingblocks.org")
(synopsis "C++ library for parallel programming") (synopsis "C++ library for parallel programming")
(description (description