diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2018-07-14 20:55:36 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2018-07-14 20:56:03 +0300 |
| commit | 0a34402b19b0563e3723f26fadb3681537e08faf (patch) | |
| tree | 5ef4a8dd48b913971fbf42369448ed01712daa9d /gnu/packages/maths.scm | |
| parent | 8911d85b9c361c53df9a9b70ae7f8b03fbdb5b49 (diff) | |
| parent | 5908818e309280b124b64f5320e4b98210093061 (diff) | |
| download | guix-0a34402b19b0563e3723f26fadb3681537e08faf.tar guix-0a34402b19b0563e3723f26fadb3681537e08faf.tar.gz | |
Merge remote-tracking branch 'origin/master' into qt-updates
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 39e2c38eb4..1e0e1998db 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2798,7 +2798,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.2.20") + (version "0.3.0") (source (origin (method url-fetch) @@ -2807,7 +2807,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1bd03c5xni0bla0wg1wba841b36b0sg13sjja955kn5xzvy4i61a")))) + "14a9vyvp2k5zpd0axbnqk0d3khc1v3cck10nb5fj7d2sgn8490ky")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -2846,6 +2846,16 @@ parts of it.") #:phases (modify-phases %standard-phases (delete 'configure) + ;; Conditionally apply a patch on i686 to avoid rebuilding + ;; all architectures. FIXME: This should be moved to the + ;; (source (patches ...)) field in the next rebuild cycle. + ,@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) + `((add-after 'unpack 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + (invoke "patch" "-p1" + "--input" (assoc-ref inputs "i686-fix-tests.patch"))))) + '()) (add-before 'build 'set-extralib (lambda* (#:key inputs #:allow-other-keys) ;; Get libgfortran found when building in utest. @@ -2857,6 +2867,11 @@ parts of it.") `(("fortran-lib" ,gfortran "lib"))) (native-inputs `(("cunit" ,cunit) + ,@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) + `(("i686-fix-tests.patch" + ,(search-patch "openblas-fix-tests-i686.patch"))) + '()) ("fortran" ,gfortran) ("perl" ,perl))) (home-page "http://www.openblas.net/") |