[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/09: gnu: petsc: Use modify-phases.
From: |
Eric Bavier |
Subject: |
05/09: gnu: petsc: Use modify-phases. |
Date: |
Thu, 21 Jul 2016 04:49:41 +0000 (UTC) |
bavier pushed a commit to branch master
in repository guix.
commit 64dcc2896389475b0a3133854952bea1fe52cada
Author: Eric Bavier <address@hidden>
Date: Thu Jul 7 17:03:44 2016 -0500
gnu: petsc: Use modify-phases.
* gnu/packages/maths.scm (petsc)[arguments]: Use modify-phases.
---
gnu/packages/maths.scm | 45 +++++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4a60e2f..b3780fa 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -829,30 +829,28 @@ ASCII text files using Gmsh's own scripting language.")
,(string-append "--with-superlu-lib="
(assoc-ref %build-inputs "superlu")
"/lib/libsuperlu.a"))
#:phases
- (alist-replace
- 'configure
- ;; PETSc's configure script is actually a python script, so we can't
- ;; run it with bash.
- (lambda* (#:key outputs (configure-flags '())
- #:allow-other-keys)
- (let* ((prefix (assoc-ref outputs "out"))
- (flags `(,(string-append "--prefix=" prefix)
- ,@configure-flags)))
- (format #t "build directory: ~s~%" (getcwd))
- (format #t "configure flags: ~s~%" flags)
- (zero? (apply system* "./configure" flags))))
- (alist-cons-after
- 'configure 'clean-local-references
- ;; Try to keep build directory names from leaking into compiled code
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (substitute* (find-files "." "^petsc(conf|machineinfo).h$")
- (((getcwd)) out))))
- (alist-cons-after
- 'install 'clean-install
+ (modify-phases %standard-phases
+ (replace 'configure
+ ;; PETSc's configure script is actually a python script, so we can't
+ ;; run it with bash.
+ (lambda* (#:key outputs (configure-flags '())
+ #:allow-other-keys)
+ (let* ((prefix (assoc-ref outputs "out"))
+ (flags `(,(string-append "--prefix=" prefix)
+ ,@configure-flags)))
+ (format #t "build directory: ~s~%" (getcwd))
+ (format #t "configure flags: ~s~%" flags)
+ (zero? (apply system* "./configure" flags)))))
+ (add-after 'configure 'clean-local-references
+ ;; Try to keep build directory names from leaking into compiled code
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* (find-files "." "^petsc(conf|machineinfo).h$")
+ (((getcwd)) out)))))
+ (add-after 'install 'clean-install
;; Try to keep installed files from leaking build directory names.
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
+ (let ((out (assoc-ref outputs "out")))
(substitute* (map (lambda (file)
(string-append out "/lib/petsc/conf/" file))
'("petscvariables" "PETScConfig.cmake"))
@@ -869,8 +867,7 @@ ASCII text files using Gmsh's own scripting language.")
'("configure.log" "make.log" "gmake.log"
"test.log" "error.log" "RDict.db"
;; Once installed, should uninstall with Guix
- "uninstall.py"))))
- %standard-phases)))))
+ "uninstall.py"))))))))
(home-page "http://www.mcs.anl.gov/petsc")
(synopsis "Library to solve PDEs")
(description "PETSc, pronounced PET-see (the S is silent), is a suite of
- branch master updated (b006ba5 -> 2908087), Eric Bavier, 2016/07/21
- 03/09: gnu: openmpi: Update to 1.10.3., Eric Bavier, 2016/07/21
- 06/09: gnu: petsc: Make header generation reproducible., Eric Bavier, 2016/07/21
- 01/09: gnu: Add libhilbert., Eric Bavier, 2016/07/21
- 04/09: gnu: openmpi: Make binaries reproducible., Eric Bavier, 2016/07/21
- 09/09: gnu: superlu-dist: Remove non-free source., Eric Bavier, 2016/07/21
- 08/09: gnu: slepc: Update to 3.7.1., Eric Bavier, 2016/07/21
- 07/09: gnu: petsc: Update to 3.7.2., Eric Bavier, 2016/07/21
- 02/09: gnu: superlu: Update to 5.2.1., Eric Bavier, 2016/07/21
- 05/09: gnu: petsc: Use modify-phases.,
Eric Bavier <=