From 493937ae1fb5b3ffdd836c144cb4682067b94de9 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Sat, 23 Dec 2017 20:36:12 +0100 Subject: [PATCH] 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 --- gnu/packages/maths.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 837e142f59..b1a497c36b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright � 2017 Dave Love ;;; ;;; This file is part of GNU Guix. ;;; @@ -2641,7 +2642,6 @@ (define-public openblas #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "SHELL=bash" - "NO_LAPACK=1" ;; Build the library for all supported CPUs. This allows ;; switching CPU targets at runtime with the environment variable ;; OPENBLAS_CORETYPE=, where "type" is a supported CPU type. @@ -2662,11 +2662,21 @@ (define-public openblas '("TARGET=ARMV8")) (else '())))) ;; 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 - `(("fortran" ,gfortran))) + `(("fortran-lib" ,gfortran "lib"))) (native-inputs `(("cunit" ,cunit) + ("fortran" ,gfortran) ("perl" ,perl))) (home-page "http://www.openblas.net/") (synopsis "Optimized BLAS library based on GotoBLAS")