public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openblas: fix static musl build

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-01-02 18:53:00 +01:00 committed by Frederik Rietdijk
parent dd5fd3b1ff
commit 867552957f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/science/math/openblas/default.nix
View File

@ -8,6 +8,7 @@
# See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
, target ? null , target ? null
, enableStatic ? false , enableStatic ? false
, enableShared ? true
}: }:
with stdenv.lib; with stdenv.lib;
@ -60,7 +61,7 @@ let
TARGET = setTarget "ATHLON"; TARGET = setTarget "ATHLON";
DYNAMIC_ARCH = true; DYNAMIC_ARCH = true;
NO_AVX512 = true; NO_AVX512 = true;
USE_OPENMP = true; USE_OPENMP = !stdenv.hostPlatform.isMusl;
}; };
}; };
in in
@ -129,6 +130,7 @@ stdenv.mkDerivation rec {
NUM_THREADS = 64; NUM_THREADS = 64;
INTERFACE64 = blas64; INTERFACE64 = blas64;
NO_STATIC = !enableStatic; NO_STATIC = !enableStatic;
NO_SHARED = !enableShared;
CROSS = stdenv.hostPlatform != stdenv.buildPlatform; CROSS = stdenv.hostPlatform != stdenv.buildPlatform;
HOSTCC = "cc"; HOSTCC = "cc";
# Makefile.system only checks defined status # Makefile.system only checks defined status

5
pkgs/top-level/static.nix
View File

@ -152,7 +152,10 @@ in {
optipng = super.optipng.override { optipng = super.optipng.override {
static = true; static = true;
}; };
openblas = super.openblas.override { enableStatic = true; }; openblas = super.openblas.override {
enableStatic = true;
enableShared = false;
};
nix = super.nix.override { withAWS = false; }; nix = super.nix.override { withAWS = false; };
# openssl 1.1 doesn't compile # openssl 1.1 doesn't compile
openssl = super.openssl_1_0_2.override { openssl = super.openssl_1_0_2.override {