Merge remote-tracking branch 'savannah/master' into mesa-updates

Change-Id: Iad185e2ced97067b3dff8fd722435a6c5e2c00e5

1 files changed, 23 insertions, 27 deletions

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 479591889f..03760f3f3e 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -402,6 +402,7 @@ triangulations.")
          (add-after 'unpack 'find-libraries
            (lambda* (#:key inputs #:allow-other-keys)
              (setenv "CVXOPT_BLAS_LIB" "openblas")
+             (setenv "CVXOPT_LAPACK_LIB" "openblas")
              (setenv "CVXOPT_BUILD_FFTW" "1")
              (setenv "CVXOPT_BUILD_GLPK" "1")
              (setenv "CVXOPT_BUILD_GSL" "1")
@@ -410,7 +411,6 @@ triangulations.")
      (list fftw
            glpk
            gsl
-           lapack
            openblas
            suitesparse))
     (home-page "https://www.cvxopt.org")
@@ -1071,7 +1071,7 @@ halfspaces) or by their double description with both representations.")
     (native-inputs
      (list pkg-config))
     (inputs
-     (list eigen lapack gfortran))
+     (list eigen openblas gfortran))
     (synopsis "Fortran subroutines for solving eigenvalue problems")
     (description
      "ARPACK-NG is a collection of Fortran77 subroutines designed to solve
@@ -1198,7 +1198,7 @@ provide LAPACK for someone who does not have access to a Fortran compiler.")
     (inputs
      `(("mpi" ,openmpi)
        ("fortran" ,gfortran)
-       ("lapack" ,lapack)))             ;for testing only
+       ("lapack" ,openblas)))             ;for testing only
     (arguments
      `(#:configure-flags `("-DBUILD_SHARED_LIBS:BOOL=YES")
        #:phases (modify-phases %standard-phases
@@ -1434,7 +1434,7 @@ Extern C linkage permits the package routines to be called from C++.")
                 "153kj4wx386609g21hw3cv5yxps62qqrc64zwb9ryd2xad1w1a4y"))))
     (build-system gnu-build-system)
     (native-inputs (list gfortran pkg-config))
-    (inputs (list cbc ipopt lapack))
+    (inputs (list cbc ipopt openblas))
     (home-page "https://coin-or.github.io/Bonmin/")
     (synopsis "Basic Open-source Nonlinear Mixed INteger programming")
     (description "Bonmin is a code for solving general MINLP (Mixed Integer
@@ -2152,7 +2152,7 @@ the resulting text.")
                      ;; SOURCE_DATE_EPOCH
                      (lambda _
                        (setenv "FORCE_SOURCE_DATE" "1"))))))
-    (inputs (list lapack fftw))
+    (inputs (list openblas fftw))
     ;; FIXME: Even though the fonts are available dvips complains:
     ;; "Font cmmi10 not found; characters will be left blank."
     (native-inputs
@@ -2400,7 +2400,8 @@ online as well as original implementations of various other algorithms.")
                 "08gznhwhqv1x4baksz350ih8q16r5rd0k8vals6078m3h94khr4b"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases (modify-phases %standard-phases
+     '(#:configure-flags (list "--with-lapack=-lopenblas")
+       #:phases (modify-phases %standard-phases
                   (add-after 'install 'add--L-flags-in-ipopt.pc
                     (lambda* (#:key inputs outputs #:allow-other-keys)
                       ;; The '.pc' file lists '-llapack -lblas' in "Libs";
@@ -2413,14 +2414,14 @@ online as well as original implementations of various other algorithms.")
                           (("Libs: (.*)-llapack -lblas(.*)$" _ before after)
                            (string-append "Libs: " before " " after "\n"
                                           "Libs.private: " before
-                                          "-L" lapack "/lib -llapack -lblas "
+                                          "-L" openblas "/lib -lopenblas"
                                           after "\n")))
                         #t))))))
     (native-inputs
      (list gfortran pkg-config))
     (inputs
      ;; TODO: Maybe add dependency on COIN-MUMPS, ASL, and HSL.
-     (list lapack))                    ;for both libblas and liblapack
+     (list openblas))                    ;for both libblas and liblapack
     (home-page "https://www.coin-or.org")
     (synopsis "Large-scale nonlinear optimizer")
     (description
@@ -2763,9 +2764,9 @@ fixed point (16.16) format.")
                    (lambda* (#:key tests? #:allow-other-keys)
                      (substitute* "test/Makefile"
                        (("LIBBLAS .*")
-                        "LIBBLAS = -lblas\n")
+                        "LIBBLAS = -lopenblas\n")
                        (("LIBLAPACK .*")
-                        "LIBLAPACK = -llapack\n"))
+                        "LIBLAPACK = -lopenblas\n"))
                      (when tests?
                        (with-directory-excursion "test"
                          (mkdir "obj")
@@ -2784,7 +2785,7 @@ fixed point (16.16) format.")
                                                     "/include/FLAME.h")
                                      (string-append static "/include"))))))))
       (inputs (list gfortran))
-      (native-inputs (list lapack perl python-wrapper))
+      (native-inputs (list openblas perl python-wrapper))
       (synopsis "High-performance library for @acronym{DLA, dense linear algebra} computations")
       (description "@code{libflame} is a portable library for dense matrix
 computations, providing much of the functionality present in LAPACK, developed
@@ -2858,7 +2859,7 @@ with constraints.")
     (native-inputs (list pkg-config))
     ;; These inputs need to be propagated to satisfy dependent packages.
     (propagated-inputs (list eigen gflags glog))
-    (inputs (list openblas lapack suitesparse))
+    (inputs (list openblas suitesparse))
     (synopsis "C++ library for solving large optimization problems")
     (description
      "Ceres Solver is a C++ library for modeling and solving large,
@@ -2925,7 +2926,7 @@ can solve two kinds of problems:
 (define-public octave-cli
   (package
     (name "octave-cli")
-    (version "8.4.0")
+    (version "9.1.0")
     (source
      (origin
        (method url-fetch)
@@ -2933,7 +2934,7 @@ can solve two kinds of problems:
                            version ".tar.xz"))
        (sha256
         (base32
-         "1a58zyrl1lx6b6wr2jbf6w806vjxr3jzbh6n85iinag47qxdg6kg"))))
+         "0jqk3amfkqzn1c5rzb9gm3v7r2y5xcgx6cgi4r5w8mpa9814nrgd"))))
     (build-system gnu-build-system)
     (inputs
      (list alsa-lib
@@ -2956,10 +2957,10 @@ can solve two kinds of problems:
            libjpeg-turbo
 
            hdf5
-           lapack
            libsndfile
            libxft
            mesa
+           openblas
            pcre
            portaudio
            qhull
@@ -3263,11 +3264,11 @@ compilers.")
            glu
            gmp
            hdf5
-           lapack
            libx11
            libxext
            mesa
            metis
+           openblas
            opencascade-occt))
     (inputs
      (list fontconfig
@@ -4444,7 +4445,6 @@ void mc64ad_dist (int *a, int *b, int *c, int *d, int *e, double *f, int *g,
     (inputs
      `(("gfortran" ,gfortran)
        ("blas" ,openblas)
-       ("lapack" ,lapack)
        ("combblas" ,combinatorial-blas)))
     (propagated-inputs
      `(("mpi" ,openmpi)                 ;headers include MPI heades
@@ -4455,7 +4455,7 @@ void mc64ad_dist (int *a, int *b, int *c, int *d, int *e, double *f, int *g,
        #:configure-flags (list "-DBUILD_SHARED_LIBS:BOOL=YES"
                                "-DTPL_ENABLE_COMBBLASLIB=YES"
                                "-DTPL_BLAS_LIBRARIES=-lopenblas"
-                               "-DTPL_LAPACK_LIBRARIES=-llapack"
+                               "-DTPL_LAPACK_LIBRARIES=-lopenblas"
                                (string-append "-DTPL_PARMETIS_LIBRARIES="
                                               (string-join
                                                '("ptscotchparmetis" "ptscotch" "ptscotcherr"
@@ -4731,15 +4731,14 @@ schemes.")
     (inputs
      `(("fortran" ,gfortran)
        ("blas" ,openblas)
-       ("lapack" ,lapack)
        ("zlib" ,zlib)))
     (arguments
      `(#:configure-flags `(,(string-append "BLAS_LIBS=-L"
                                            (assoc-ref %build-inputs "blas")
                                            " -lopenblas")
                            ,(string-append "LAPACK_LIBS=-L"
-                                           (assoc-ref %build-inputs "lapack")
-                                           " -llapack"))
+                                           (assoc-ref %build-inputs "blas")
+                                           " -lopenblas"))
        #:phases (modify-phases %standard-phases
                   (add-before 'check 'mpi-setup
 		    ,%openmpi-setup))))
@@ -4989,7 +4988,7 @@ full text searching.")
     (build-system cmake-build-system)
     (arguments `(#:tests? #f))          ; no test target
     (inputs
-     (list openblas lapack arpack-ng))
+     (list openblas arpack-ng))
     (home-page "https://arma.sourceforge.net/")
     (synopsis "C++ linear algebra library")
     (description
@@ -6791,7 +6790,6 @@ A unique design feature of Trilinos is its focus on packages.")
      (list arpack-ng
            openblas
            gfortran
-           lapack
            muparser
            zlib))
     (propagated-inputs
@@ -7108,7 +7106,7 @@ set.")
                   texlive-xcolor
                   texlive-xypic))))
     (inputs
-     (list openblas lapack))
+     (list openblas))
     (arguments
      `(#:modules ((srfi srfi-1)
                   ,@%gnu-build-system-modules)
@@ -7809,7 +7807,6 @@ symmetric matrices.")
       (inputs
        (list `(,gfortran "lib")
              gmp
-             lapack
              metis
              mpc
              mpfr
@@ -8047,7 +8044,7 @@ easily be incorporated into existing simulation codes.")
          "0nx4sqhmi126m14myzm7syv2053harav9snl0a247wnkcgs5rxrv"))))
     (inputs
      (modify-inputs (package-inputs sundials)
-       (prepend gfortran lapack)))
+       (prepend gfortran openblas)))
     (arguments
      '(#:configure-flags `("-DCMAKE_C_FLAGS=-O2 -g -fcommon"
                            "-DSUNDIALS_INDEX_SIZE=32"
@@ -9792,7 +9789,6 @@ computation is supported via MPI.")
                   fftw
                   gettext-minimal
                   hdf5-1.10
-                  lapack
                   libarchive
                   libx11
                   libxml2