From ef39a17717a10a7f406730258acfdb07934c7255 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Mon, 26 Jun 2017 16:57:19 +0200
Subject: gnu: lapack: Update to 3.7.1.

* gnu/packages/maths.scm (lapack): Update to 3.7.1.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/maths.scm')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9bdb068774..b43f2d63e9 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -428,7 +428,7 @@ large scale eigenvalue problems.")
 (define-public lapack
   (package
     (name "lapack")
-    (version "3.5.0")
+    (version "3.7.1")
     (source
      (origin
       (method url-fetch)
@@ -436,7 +436,7 @@ large scale eigenvalue problems.")
                           version ".tgz"))
       (sha256
        (base32
-        "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"))))
+        "0yavf6m9l78pwlnk5g61cg8x28mr30j0g8gkai0jrdqfjjmf3whs"))))
     (build-system cmake-build-system)
     (home-page "http://www.netlib.org/lapack/")
     (inputs `(("fortran" ,gfortran)
-- 
cgit v1.2.3


From 11f0c4e871d09f3122c59f665c0ad18dcd4fc5eb Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Mon, 26 Jun 2017 16:59:11 +0200
Subject: gnu: lapack: Build with LAPACKE_WITH_TMG=ON.

* gnu/packages/maths.scm (lapack)[arguments]: Pass
"-DLAPACKE_WITH_TMG=ON".
---
 gnu/packages/maths.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/maths.scm')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b43f2d63e9..3c93e2c7ec 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -443,7 +443,10 @@ large scale eigenvalue problems.")
               ("python" ,python-2)))
     (arguments
      `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES"
-                           "-DLAPACKE=ON")
+                           "-DLAPACKE=ON"
+
+                           ;; Build the 'LAPACKE_clatms' functions.
+                           "-DLAPACKE_WITH_TMG=ON")
        #:phases (alist-cons-before
                  'check 'patch-python
                  (lambda* (#:key inputs #:allow-other-keys)
-- 
cgit v1.2.3


From 26599d692cc4ae563c56a30bdc1e8f03f47c582f Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Mon, 26 Jun 2017 17:00:36 +0200
Subject: gnu: scotch: Build in 64-bit mode on 64-bit machines.

* gnu/packages/maths.scm (scotch)[arguments] <configure>: Add
"INTSIZE64" CPP flag.
---
 gnu/packages/maths.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu/packages/maths.scm')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 3c93e2c7ec..851694bd4d 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1875,6 +1875,7 @@ YACC = bison -pscotchyy -y -b y
                         '("COMMON_FILE_COMPRESS_GZ"
                           "COMMON_PTHREAD"
                           "COMMON_RANDOM_FIXED_SEED"
+                          "INTSIZE64"             ;use 'long' instead of 'int'
                           ;; Prevents symbolc clashes with libesmumps
                           "SCOTCH_RENAME"
                           ;; XXX: Causes invalid frees in superlu-dist tests
-- 
cgit v1.2.3


From 3ab869b63fc43c8d13864d711c2dc55fb3691456 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Thu, 29 Jun 2017 14:46:07 +0200
Subject: gnu: lapack: Install libraries to PREFIX/lib, not PREFIX/lib64.

This fixes a regression introduced in
ef39a17717a10a7f406730258acfdb07934c7255, which would break
python-scipy ("undefined reference to `zungqr_'").

* gnu/packages/maths.scm (lapack)[arguments]: Add
"-DCMAKE_INSTALL_LIBDIR" to #:configure-flags.
---
 gnu/packages/maths.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/maths.scm')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 851694bd4d..5e4cd85860 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -442,11 +442,18 @@ large scale eigenvalue problems.")
     (inputs `(("fortran" ,gfortran)
               ("python" ,python-2)))
     (arguments
-     `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES"
-                           "-DLAPACKE=ON"
-
-                           ;; Build the 'LAPACKE_clatms' functions.
-                           "-DLAPACKE_WITH_TMG=ON")
+     `(#:configure-flags (list
+                          ;; Install to PREFIX/lib (the default is
+                          ;; PREFIX/lib64).
+                          (string-append "-DCMAKE_INSTALL_LIBDIR="
+                                         (assoc-ref %outputs "out")
+                                         "/lib")
+
+                          "-DBUILD_SHARED_LIBS:BOOL=YES"
+                          "-DLAPACKE=ON"
+
+                          ;; Build the 'LAPACKE_clatms' functions.
+                          "-DLAPACKE_WITH_TMG=ON")
        #:phases (alist-cons-before
                  'check 'patch-python
                  (lambda* (#:key inputs #:allow-other-keys)
-- 
cgit v1.2.3