diff options
| author | Eric Bavier <bavier@member.fsf.org> | 2017-08-08 21:43:15 -0500 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2017-08-09 01:56:53 -0500 |
| commit | bd5b5ac0c5721d85c8031f85df8a02b245170018 (patch) | |
| tree | 12d710dc2e85c2c22e4520de471836f4fae31f0d | |
| parent | 2509522c4f4be4491418e65b764862a05444f460 (diff) | |
| download | guix-bd5b5ac0c5721d85c8031f85df8a02b245170018.tar guix-bd5b5ac0c5721d85c8031f85df8a02b245170018.tar.gz | |
gnu: suitesparse: Update to 4.5.5.
* gnu/packages/maths.scm (suitesparse): Update to 4.5.5.
[source]: Add 'modules' and 'snippet' field to remove bundled source.
[arguments]: Remove 'prepare-out' phase. Adjust #:make-flags for metis.
Make build parallel, since it now appears to be safe.
[inputs]: Add metis.
| -rw-r--r-- | gnu/packages/maths.scm | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5f2697e13c..78c77b6813 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2424,7 +2424,7 @@ Fresnel integrals, and similar related functions as well.") (define-public suitesparse (package (name "suitesparse") - (version "4.4.3") + (version "4.5.5") (source (origin (method url-fetch) @@ -2433,32 +2433,31 @@ Fresnel integrals, and similar related functions as well.") version ".tar.gz")) (sha256 (base32 - "100hdzr0mf4mzlwnqpmwpfw4pymgsf9n3g0ywb1yps2nk1zbkdy5")))) + "1dnr6pmjzc2qmbkmb4shigx1l74ilf6abn7svyd6brxgvph8vadr")) + (modules '((guix build utils))) + (snippet + ;; Remove bundled metis source + '(delete-file-recursively "metis-5.1.0")))) (build-system gnu-build-system) (arguments - '(#:parallel-build? #f ;cholmod build fails otherwise - #:tests? #f ;no "check" target + '(#:tests? #f ;no "check" target #:make-flags (list "CC=gcc" "BLAS=-lblas" "TBB=-ltbb" - "CHOLMOD_CONFIG=-DNPARTITION" ;required when METIS is not used + "MY_METIS_LIB=-lmetis" (string-append "INSTALL_LIB=" (assoc-ref %outputs "out") "/lib") (string-append "INSTALL_INCLUDE=" - (assoc-ref %outputs "out") "/include")) + (assoc-ref %outputs "out") "/include") + "library") #:phases (modify-phases %standard-phases - (delete 'configure) ;no configure script - (add-before 'install 'prepare-out - ;; README.txt states that the target directories must exist prior to - ;; running "make install". - (lambda _ - (mkdir-p (string-append (assoc-ref %outputs "out") "/lib")) - (mkdir-p (string-append (assoc-ref %outputs "out") "/include"))))))) + (delete 'configure)))) ;no configure script (inputs `(("tbb" ,tbb) - ("lapack" ,lapack))) + ("lapack" ,lapack) + ("metis" ,metis))) (home-page "http://faculty.cse.tamu.edu/davis/suitesparse.html") (synopsis "Suite of sparse matrix software") (description |