Merge pull request #39384 from timokau/fllas-ffpack-atlas

fflas-ffpack: Drop liblapack dependency
This commit is contained in:
Matthew Justin Bauer 2018-04-23 16:43:01 -05:00 committed by GitHub
commit 50d410b9be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack { stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas
, gmpxx , gmpxx
, optimize ? false # impure , optimize ? false # impure
}: }:
@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
autoreconfHook autoreconfHook
pkgconfig pkgconfig
] ++ stdenv.lib.optionals doCheck checkInputs; ] ++ stdenv.lib.optionals doCheck checkInputs;
buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; buildInputs = [ givaro openblas];
configureFlags = [ configureFlags = [
"--with-blas-libs=-lopenblas" "--with-blas-libs=-lopenblas"
"--with-lapack-libs=-llapack" "--with-lapack-libs=-lopenblas"
] ++ stdenv.lib.optionals (!optimize) [ ] ++ stdenv.lib.optionals (!optimize) [
# disable SIMD instructions (which are enabled *when available* by default) # disable SIMD instructions (which are enabled *when available* by default)
"--disable-sse" "--disable-sse"