[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/10: gnu: tbb: Use modify-phases syntax.
From: |
Ricardo Wurmus |
Subject: |
01/10: gnu: tbb: Use modify-phases syntax. |
Date: |
Mon, 26 Sep 2016 12:31:10 +0000 (UTC) |
rekado pushed a commit to branch master
in repository guix.
commit 7f5ca399bfe43c32f3a61acb2b7440737e7bbcc5
Author: Ricardo Wurmus <address@hidden>
Date: Mon Sep 26 12:08:13 2016 +0200
gnu: tbb: Use modify-phases syntax.
* gnu/packages/tbb.scm (tbb)[arguments]: Use "modify-phases" syntax.
---
gnu/packages/tbb.scm | 59 +++++++++++++++++++++++++-------------------------
1 file changed, 29 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm
index c19391a..eab51f8 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 <address@hidden>
+;;; Copyright © 2015, 2016 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016 ng0 <address@hidden>
;;;
;;; 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
- branch master updated (af8de20 -> 675d7ae), Ricardo Wurmus, 2016/09/26
- 03/10: gnu: tbb: Fail on test errors., Ricardo Wurmus, 2016/09/26
- 07/10: gnu: ghc-cmark: Update to 0.5.3.1., Ricardo Wurmus, 2016/09/26
- 09/10: gnu: ghc-pandoc: Update to 1.17.2., Ricardo Wurmus, 2016/09/26
- 08/10: gnu: ghc-texmath: Update to 0.8.6.5., Ricardo Wurmus, 2016/09/26
- 06/10: gnu: ghc-highlighting-kate: Update to 0.6.3., Ricardo Wurmus, 2016/09/26
- 02/10: gnu: ghc-tls: Update to 1.3.8., Ricardo Wurmus, 2016/09/26
- 01/10: gnu: tbb: Use modify-phases syntax.,
Ricardo Wurmus <=
- 10/10: gnu: ncbi-vdb: Only build on i686 and x86_64., Ricardo Wurmus, 2016/09/26
- 05/10: gnu: ghc-pandoc-types: Update to 1.16.1.1., Ricardo Wurmus, 2016/09/26
- 04/10: gnu: ghc-tagsoup: Update to 0.14., Ricardo Wurmus, 2016/09/26