Skip to content

Blas/Lapack cross fixes#92412

Merged
FRidh merged 3 commits intoNixOS:stagingfrom
matthewbauer:blas-cross
Aug 15, 2020
Merged

Blas/Lapack cross fixes#92412
FRidh merged 3 commits intoNixOS:stagingfrom
matthewbauer:blas-cross

Conversation

@matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Jul 6, 2020

Cross compilation fixes for blas/lapack

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@matthewbauer
cc-wrapper: set FC when langFortran is on
f42aa7e 
We need to set FC so that CMake and other tools can find the fortran
compiler. Also we need to limit the hardening flags since fortify and
format don’t work with fortran.

Fixes NixOS#88449
@matthewbauer
blas: use $NM instead of nm
e7ea3de 
This is the right one on cross compilation.
@matthewbauer
arpack: add blas, lapack to library path
8a525d6 
Fixes NixOS#89215
@matthewbauer matthewbauer requested a review from Ericson2314 as a code owner July 6, 2020 05:31
@ofborg ofborg bot requested review from Synthetica9, peti, ttuegel and veprbl July 6, 2020 05:39
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Jul 6, 2020
@matthewbauer matthewbauer changed the base branch from master to staging July 6, 2020 16:27
@ofborg ofborg bot requested a review from ttuegel July 6, 2020 17:30
Ericson2314
Ericson2314 reviewed Jul 7, 2020
View reviewed changes
pkgs/build-support/cc-wrapper/fortran-hook.sh
Comment on lines +6 to +9
# If unset, assume the default hardening flags.
# These are different for fortran.
: ${NIX_HARDENING_ENABLE="stackprotector pic strictoverflow relro bindnow"}
export NIX_HARDENING_ENABLE
Copy link
Member

@Ericson2314 Ericson2314 Jul 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this fortran-specific?

Copy link
Member Author

@matthewbauer matthewbauer Jul 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah - fortify & format don't work well in fortran. it's non-fatal, but we shouldn't need to set it.

Copy link
Member Author

@matthewbauer matthewbauer Jul 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i guess this is kind of an issue since it does effect cc/c++ as well

@FRidh FRidh merged commit d59c57f into NixOS:staging Aug 15, 2020
@LunNova LunNova mentioned this pull request Oct 13, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Ericson2314 left review comments

@ttuegel ttuegel ttuegel approved these changes

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

@peti peti Awaiting requested review from peti

@veprbl veprbl Awaiting requested review from veprbl

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@matthewbauer @ttuegel @Ericson2314 @FRidh