ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: scotch, pt-scotch: Use modify-phases.

Browse source 
* gnu/packages/maths.scm (scotch, pt-scotch)[arguments]: Use modify-phases.
This commit is contained in:
Eric Bavier 2015-06-15 05:09:55 -05:00
parent 6c7985408f
commit d6602ee9d4
1 changed files with 31 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gnu/packages/maths.scm
View file

@ -802,10 +802,11 @@ (define-public scotch
("bison" ,bison))) ("bison" ,bison)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
(add-after
'unpack 'chdir-to-src 'unpack 'chdir-to-src
(lambda _ (chdir "src")) (lambda _ (chdir "src")))
(alist-replace (replace
'configure 'configure
(lambda _ (lambda _
(call-with-output-file "Makefile.inc" (call-with-output-file "Makefile.inc"
@ -837,16 +838,15 @@ (define-public scotch
;; XXX: Causes invalid frees in superlu-dist tests ;; XXX: Causes invalid frees in superlu-dist tests
;; "SCOTCH_PTHREAD" ;; "SCOTCH_PTHREAD"
;; "SCOTCH_PTHREAD_NUMBER=2" ;; "SCOTCH_PTHREAD_NUMBER=2"
"restrict=__restrict"))))) "restrict=__restrict"))))))
(alist-replace (replace
'install 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(mkdir out) (mkdir out)
(zero? (system* "make" (zero? (system* "make"
(string-append "prefix=" out) (string-append "prefix=" out)
"install")))) "install"))))))))
%standard-phases)))))
(home-page "http://www.labri.fr/perso/pelegrin/scotch/") (home-page "http://www.labri.fr/perso/pelegrin/scotch/")
(synopsis "Programs and libraries for graph algorithms") (synopsis "Programs and libraries for graph algorithms")
(description "SCOTCH is a set of programs and libraries which implement (description "SCOTCH is a set of programs and libraries which implement
@ -867,26 +867,18 @@ (define-public pt-scotch
(arguments (arguments
(substitute-keyword-arguments (package-arguments scotch) (substitute-keyword-arguments (package-arguments scotch)
((#:phases scotch-phases) ((#:phases scotch-phases)
`(alist-replace `(modify-phases ,scotch-phases
(replace
'build 'build
;; TODO: Would like to add parallelism here ;; TODO: Would like to add parallelism here
(lambda _ (lambda _
(and (and
(zero? (system* "make" "ptscotch")) (zero? (system* "make" "ptscotch"))
;; Install the serial metis compatibility library ;; Install the serial metis compatibility library
(zero? (system* "make" "-C" "libscotchmetis" "install")))) (zero? (system* "make" "-C" "libscotchmetis" "install")))))
(alist-replace (replace
'check 'check
(lambda _ (zero? (system* "make" "ptcheck"))) (lambda _ (zero? (system* "make" "ptcheck"))))))))
(alist-replace
'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir out)
(zero? (system* "make"
(string-append "prefix=" out)
"install"))))
,scotch-phases))))))
(synopsis "Programs and libraries for graph algorithms (with MPI)"))) (synopsis "Programs and libraries for graph algorithms (with MPI)")))
(define-public gsegrafix (define-public gsegrafix