01/01: gnu: openblas: Build with LAPACK.

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit 493937ae1fb5b3ffdd836c144cb4682067b94de9
Author: Dave Love <address@hidden>
Date:   Sat Dec 23 20:36:12 2017 +0100

    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 <address@hidden>
---
 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 837e142..b1a497c 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2017 Theodoros Foradis <address@hidden>
 ;;; Copyright © 2017 Arun Isaac <address@hidden>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright � 2017 Dave Love <address@hidden@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2641,7 +2642,6 @@ parts of it.")
        #: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=<type>, where "type" is a supported CPU type.
@@ -2662,11 +2662,21 @@ parts of it.")
                    '("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")