me
/
guix
Archived
1
0
Fork 0

gnu: openblas: Build with LAPACK.

* gnu/packages/maths.scm (openblas)[arguments]: Don't disable LAPACK;
add set-extralib phase.
[inputs]: Add fortran-lib.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
master
Dave Love 2017-12-23 20:36:12 +01:00 committed by Danny Milosavljevic
parent 6a069618ab
commit 493937ae1f
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 13 additions and 3 deletions

View File

@ -21,6 +21,7 @@
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright <20> 2017 Dave Love <me@fx@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2641,7 +2642,6 @@ parts of it.")
#:make-flags #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")) (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"SHELL=bash" "SHELL=bash"
"NO_LAPACK=1"
;; Build the library for all supported CPUs. This allows ;; Build the library for all supported CPUs. This allows
;; switching CPU targets at runtime with the environment variable ;; switching CPU targets at runtime with the environment variable
;; OPENBLAS_CORETYPE=<type>, where "type" is a supported CPU type. ;; OPENBLAS_CORETYPE=<type>, where "type" is a supported CPU type.
@ -2662,11 +2662,21 @@ parts of it.")
'("TARGET=ARMV8")) '("TARGET=ARMV8"))
(else '())))) (else '()))))
;; no configure script ;; no configure script
#:phases (alist-delete 'configure %standard-phases))) #:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'set-extralib
(lambda* (#:key inputs #:allow-other-keys)
;; Get libgfortran found when building in utest.
(setenv "FEXTRALIB"
(string-append "-L" (assoc-ref inputs "fortran-lib")
"/lib"))
#t)))))
(inputs (inputs
`(("fortran" ,gfortran))) `(("fortran-lib" ,gfortran "lib")))
(native-inputs (native-inputs
`(("cunit" ,cunit) `(("cunit" ,cunit)
("fortran" ,gfortran)
("perl" ,perl))) ("perl" ,perl)))
(home-page "http://www.openblas.net/") (home-page "http://www.openblas.net/")
(synopsis "Optimized BLAS library based on GotoBLAS") (synopsis "Optimized BLAS library based on GotoBLAS")