diff options
| author | Felix Gruber <felgru@posteo.net> | 2020-03-04 22:41:08 +0100 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2020-03-04 18:08:13 -0500 |
| commit | aac148a87b9a79b9992b8b1a9d76c217175d4a88 (patch) | |
| tree | d413cce1b1530b0269be64bd650676c08b9b969f /gnu/packages/maths.scm | |
| parent | c2d7e800e6788277bc56f31d5836f9d507dc1506 (diff) | |
| download | guix-patches-aac148a87b9a79b9992b8b1a9d76c217175d4a88.tar guix-patches-aac148a87b9a79b9992b8b1a9d76c217175d4a88.tar.gz | |
gnu: SuiteSparse: Update to 5.7.1.
* gnu/packages/maths.scm (suitesparse): Update to 5.7.1.
[source]: The latest releases of SuiteSparse have only been published on GitHub.
Fetch from git tag as GitHub releases page only contains autogenerated tarballs
that guix lint complains about. Apply new patch for Mongoose's CMakeList.txt to
find SuiteSparse_config.
[arguments]: Add CMake flags used by new components GraphBLAS and Mongoose.
[native-inputs]: Add CMake and m4 needed to build GraphBLAS and Mongoose.
* gnu/packages/patches/suitesparse-mongoose-cmake.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Leo Famulari <leo@famulari.name>
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cab84a520b..a990ffc45e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com> ;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> +;;; Copyright © 2020 Felix Gruber <felgru@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -3405,16 +3406,18 @@ Fresnel integrals, and similar related functions as well.") (define-public suitesparse (package (name "suitesparse") - (version "4.5.5") + (version "5.7.1") (source (origin - (method url-fetch) - (uri (string-append - "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/DrTimothyAldenDavis/SuiteSparse.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1dnr6pmjzc2qmbkmb4shigx1l74ilf6abn7svyd6brxgvph8vadr")) + "174p3l78kv9gaa0i5hflyai2ydwnjzh34k9938sl4aa3li0543s8")) + (patches (search-patches "suitesparse-mongoose-cmake.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled metis source @@ -3429,6 +3432,14 @@ Fresnel integrals, and similar related functions as well.") "BLAS=-lblas" "TBB=-ltbb" "MY_METIS_LIB=-lmetis" + ;; Flags for cmake (required to build GraphBLAS and Mongoose) + (string-append "CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out") + " -DCMAKE_VERBOSE_MAKEFILE=ON" + " -DCMAKE_C_FLAGS_RELEASE=\"$(CFLAGS) $(CPPFLAGS)\"" + " -DCMAKE_CXX_FLAGS_RELEASE=\"$(CXXFLAGS) $(CPPFLAGS)\"" + " -DCMAKE_SKIP_RPATH=TRUE" + " -DCMAKE_BUILD_TYPE=Release") (string-append "INSTALL_LIB=" (assoc-ref %outputs "out") "/lib") (string-append "INSTALL_INCLUDE=" @@ -3441,6 +3452,9 @@ Fresnel integrals, and similar related functions as well.") `(("tbb" ,tbb) ("lapack" ,lapack) ("metis" ,metis))) + (native-inputs + `(("cmake" ,cmake) + ("m4" ,m4))) (home-page "http://faculty.cse.tamu.edu/davis/suitesparse.html") (synopsis "Suite of sparse matrix software") (description |