From c93579d0fa772c95c0298d4d838ef53bdd07982d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 7 Mar 2018 18:45:46 +0100 Subject: fflas-ffpack: enable checks, disable simd --- .../development/libraries/fflas-ffpack/default.nix | 31 +++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index edea352ae2dd..82ece22b7c7d 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,7 @@ -{stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack}: +{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack +, gmpxx +, optimize ? false # impure +}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fflas-ffpack"; @@ -9,9 +12,31 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + checkInputs = [ + gmpxx + ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ] ++ stdenv.lib.optionals doCheck checkInputs; buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; - configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack"; + configureFlags = [ + "--with-blas-libs=-lopenblas" + "--with-lapack-libs=-llapack" + ] ++ stdenv.lib.optionals (!optimize) [ + # disable SIMD instructions (which are enabled *when available* by default) + "--disable-sse" + "--disable-sse2" + "--disable-sse3" + "--disable-ssse3" + "--disable-sse41" + "--disable-sse42" + "--disable-avx" + "--disable-avx2" + "--disable-fma" + "--disable-fma4" + ]; + doCheck = true; meta = { inherit version; description = ''Finite Field Linear Algebra Subroutines''; -- cgit 1.4.1