Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

glibc, openssl: unbreak cross eval (with minor caveats) #79738

Merged
merged 1 commit into from Feb 10, 2020

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Feb 10, 2020

It's certainly better to have those two caveats than not evaluate.
Both seem rather niche. Unfortunately I failed to find a better way.
I started testing builds of several cross variants; all seem OK.

Fixes #79610 (with minor caveats)

It's certainly better to have those two caveats than not evaluate.
Both seem rather niche.  Unfortunately I failed to find a better way.
I started testing builds of several cross variants; all seem OK.
@vcunat
Copy link
Member Author

@vcunat vcunat commented Feb 10, 2020

Tested building bash on some cross examples that came into my mind:

nix build -f . bash --arg crossSystem '(import ./lib).systems.examples.armv7l-hf-multiplatform'
nix build -f . bash --arg crossSystem '(import ./lib).systems.examples.aarch64-multiplatform'
nix build -f . bash --arg crossSystem '(import ./lib).systems.examples.musl64'
@Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Feb 10, 2020

Is the separateDebugInfo completely separate?

@vcunat
Copy link
Member Author

@vcunat vcunat commented Feb 10, 2020

It's separate in the sense of being put into a separate derivation output, openssl.debug in this case.

@FRidh
FRidh approved these changes Feb 10, 2020
Copy link
Member

@FRidh FRidh left a comment

Tested cross eval

separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false)
&& stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc
&& stdenv.cc.isGNU;

This comment has been minimized.

@matthewbauer

matthewbauer Feb 10, 2020
Member

the fix is good, but it sounds like we need to tweak llvm to work with separate-debug-info.sh, since I bet that everything is broken, not just openssl.

This comment has been minimized.

@vcunat

vcunat Feb 10, 2020
Author Member

Right, that certainly seems preferable, but I have no idea about difficulty of that :-)

vcunat added a commit that referenced this pull request Feb 10, 2020
(with minor caveats)
@vcunat vcunat merged commit c203848 into NixOS:master Feb 10, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
glibc, openssl on aarch64-linux Success
Details
glibc, openssl on x86_64-darwin Success
Details
glibc, openssl on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@vcunat vcunat deleted the vcunat:p/glibc-2.30-cross branch Feb 10, 2020
@vcunat
Copy link
Member Author

@vcunat vcunat commented Feb 10, 2020

I merged relatively fast to avoid additional cherry-pick after 20.03 branch-off. We can improve later if there's an idea how.

vcunat added a commit to vcunat/nixpkgs that referenced this pull request Feb 14, 2020
Thanks to python3Minimal.  This reverts part of c203848 NixOS#79738.
worldofpeace added a commit that referenced this pull request Feb 15, 2020
Thanks to python3Minimal.  This reverts part of c203848 #79738.

(cherry picked from commit 5a8000d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

4 participants
You can’t perform that action at this time.