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

gnu: scotch: Return #t from all phases. 

* gnu/packages/maths.scm (scotch)[arguments]: Return #t rather than undefined from phases. Substitute INVOKE for SYSTEM*.
This commit is contained in:
Tobias Geerinckx-Rice 2018-06-30 02:32:11 +02:00
parent 49fdd357a2
commit d67a7e9e8d
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/maths.scm
View File

@ -2283,7 +2283,7 @@ implemented in ANSI C, and MPI for communications.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after (add-after
'unpack 'chdir-to-src 'unpack 'chdir-to-src
(lambda _ (chdir "src"))) (lambda _ (chdir "src") #t))
(replace (replace
'configure 'configure
(lambda _ (lambda _
@ -2320,7 +2320,8 @@ YACC = bison -pscotchyy -y -b y
;; 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"))))
#t))
(add-after (add-after
'build 'build-esmumps 'build 'build-esmumps
(lambda _ (lambda _
@ -2330,24 +2331,25 @@ YACC = bison -pscotchyy -y -b y
;; isn't used anyway.) ;; isn't used anyway.)
(setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) (setenv "OMPI_MCA_plm_rsh_agent" (which "cat"))
(zero? (system* "make" (invoke "make"
(format #f "-j~a" (parallel-job-count)) (format #f "-j~a" (parallel-job-count))
"esmumps")))) "esmumps")))
(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" (invoke "make"
(string-append "prefix=" out) (string-append "prefix=" out)
"install")) "install")
;; esmumps files are not installed with the above ;; esmumps files are not installed with the above
(for-each (lambda (f) (for-each (lambda (f)
(copy-file f (string-append out "/include/" f))) (copy-file f (string-append out "/include/" f)))
(find-files "../include" ".*esmumps.h$")) (find-files "../include" ".*esmumps.h$"))
(for-each (lambda (f) (for-each (lambda (f)
(copy-file f (string-append out "/lib/" f))) (copy-file f (string-append out "/lib/" f)))
(find-files "../lib" "^lib.*esmumps.*")))))))) (find-files "../lib" "^lib.*esmumps.*"))
#t))))))
(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