me
/
guix
Archived
1
0
Fork 0
Code

gnu: petsc, slepc: Use 'parallel-job-count'. 

* gnu/packages/maths.scm (petsc, slepc)[arguments]: Set #:make-flags to
override default unlimited '-j'.
(petsc)[arguments]: Scrub build machine cores from installed files in
'clean-local-references' phase.
master
Eric Bavier 2017-08-08 00:21:20 -05:00
parent baeaf8821d
commit 9731c412e9
No known key found for this signature in database
GPG Key ID: FD73CAC719D32566
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/maths.scm
View File

@ -1247,6 +1247,10 @@ September 2004}")
(assoc-ref %build-inputs "superlu") "/include") (assoc-ref %build-inputs "superlu") "/include")
,(string-append "--with-superlu-lib=" ,(string-append "--with-superlu-lib="
(assoc-ref %build-inputs "superlu") "/lib/libsuperlu.a")) (assoc-ref %build-inputs "superlu") "/lib/libsuperlu.a"))
#:make-flags
;; Honor (parallel-job-count) for build. Do not use --with-make-np,
;; whose value is dumped to $out/lib/petsc/conf/petscvariables.
(list (format #f "MAKE_NP=~a" (parallel-job-count)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -1261,13 +1265,17 @@ September 2004}")
(format #t "configure flags: ~s~%" flags) (format #t "configure flags: ~s~%" flags)
(zero? (apply system* "./configure" flags))))) (zero? (apply system* "./configure" flags)))))
(add-after 'configure 'clean-local-references (add-after 'configure 'clean-local-references
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* (find-files "." "^petsc(conf|machineinfo).h$") (substitute* (find-files "." "^petsc(conf|machineinfo).h$")
;; Prevent build directory from leaking into compiled code ;; Prevent build directory from leaking into compiled code
(((getcwd)) out) (((getcwd)) out)
;; Scrub timestamp for reproducibility ;; Scrub timestamp for reproducibility
((".*Libraries compiled on.*") "")) ((".*Libraries compiled on.*") ""))
(substitute* (find-files "." "petscvariables")
;; Do not expose build machine characteristics, set to defaults.
(("MAKE_NP = [:digit:]+") "MAKE_NP = 2")
(("NPMAX = [:digit:]+") "NPMAX = 2"))
#t))) #t)))
(add-after 'install 'clean-install (add-after 'install 'clean-install
;; Try to keep installed files from leaking build directory names. ;; Try to keep installed files from leaking build directory names.
@ -1364,6 +1372,8 @@ scientific applications modeled by partial differential equations.")
#:configure-flags #:configure-flags
`(,(string-append "--with-arpack-dir=" `(,(string-append "--with-arpack-dir="
(assoc-ref %build-inputs "arpack") "/lib")) (assoc-ref %build-inputs "arpack") "/lib"))
#:make-flags ;honor (parallel-job-count)
`(,(format #f "MAKE_NP=~a" (parallel-job-count)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure