openblas: fix static musl build #76832
Merged
+7
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Normal and cross builds still function. |
FRidh
changed the title
10 tasks
|
#75798 currently implements a following change: diff a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -115,6 +115,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
perl
which
+ ];
+
+ depsBuildBuild = [
buildPackages.gfortran
buildPackages.stdenv.cc
];It may (or may not be) useful here. |
FRidh
requested review from
adisbladis,
alyssais,
basvandijk,
cdepillabout,
etu,
infinisil,
jonringer,
LnL7,
matthewbauer,
Mic92,
thoughtpolice,
ttuegel and
zimbatm
as code owners
FRidh
removed request for
zimbatm,
thoughtpolice,
adisbladis,
cdepillabout,
Mic92,
etu,
basvandijk,
LnL7,
alyssais and
jonringer
ofborg
bot
removed
6.topic: haskell
6.topic: lua
6.topic: nixos
FRidh
changed the title
FRidh
commented
Jan 3, 2020
| @@ -60,7 +61,7 @@ let | |||
| TARGET = setTarget "ATHLON"; | |||
| DYNAMIC_ARCH = true; | |||
| NO_AVX512 = true; | |||
| USE_OPENMP = true; | |||
| USE_OPENMP = !stdenv.hostPlatform.isMusl; | |||
There was a problem hiding this comment.
just this seems to be sufficient actually to solve the omp issue
FRidh
commented
Jan 3, 2020
| FC = "${stdenv.cc.targetPrefix}gfortran"; | ||
| CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}"; | ||
| PREFIX = placeholder "out"; | ||
| NUM_THREADS = 64; | ||
| INTERFACE64 = blas64; | ||
| NO_STATIC = !enableStatic; | ||
| NO_SHARED = !enableShared; |
There was a problem hiding this comment.
this does speed up the build
There was a problem hiding this comment.
actually, it is also needed to prevent
/nix/store/394p75bacqaiv0xvyna0kazf2lg16sjs-x86_64-unknown-linux-musl-binutils-2.31.1/bin/x86_64-unknown-linux-musl-ld: /nix/store/cmrar1sgj5jpr9h1ypf3s6sbphaxp8zk-x86_64-unknown-linux-musl-stage-final-gfortran-debug-9.2.0/lib/gcc/x86_64-unknown-linux-musl/9.2.0/crtbeginT.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object
/nix/store/394p75bacqaiv0xvyna0kazf2lg16sjs-x86_64-unknown-linux-musl-binutils-2.31.1/bin/x86_64-unknown-linux-musl-ld: /nix/store/cmrar1sgj5jpr9h1ypf3s6sbphaxp8zk-x86_64-unknown-linux-musl-stage-final-gfortran-debug-9.2.0/lib/gcc/x86_64-unknown-linux-musl/9.2.0/crtend.o: relocation R_X86_64_32 against `.ctors' can not be used when making a shared object; recompile with -fPIC
/nix/store/394p75bacqaiv0xvyna0kazf2lg16sjs-x86_64-unknown-linux-musl-binutils-2.31.1/bin/x86_64-unknown-linux-musl-ld: final link failed: nonrepresentable section on output
FRidh
commented
Jan 3, 2020
| CROSS = stdenv.hostPlatform != stdenv.buildPlatform; | ||
| HOSTCC = "cc"; | ||
| HOSTCC = if stdenv.hostPlatform.isMusl then CC else "cc"; |
There was a problem hiding this comment.
this was fixed by using depsBuildBuild
FRidh
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @