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: fix cross compilation build failure (again) #77525

Merged
merged 2 commits into from Jan 13, 2020

Conversation

@thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Jan 11, 2020

Motivation for this change

The backport in #76972 was bad. cc @flokli

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.
@flokli
Copy link
Contributor

@flokli flokli commented Jan 11, 2020

@thefloweringash can this be rebased on latest staging?

@thefloweringash thefloweringash force-pushed the thefloweringash:fixup-backport branch from de22003 to 22a8e7f Jan 11, 2020
@thefloweringash thefloweringash changed the title glibc: fix bad backport in #76972 glibc: fix cross compilation build failure (again) Jan 11, 2020
@ofborg ofborg bot requested a review from edolstra Jan 11, 2020
@thefloweringash thefloweringash marked this pull request as ready for review Jan 11, 2020
@thefloweringash
Copy link
Member Author

@thefloweringash thefloweringash commented Jan 11, 2020

There was another out of bounds that needed fixing. I've tested this as far as building pkgsCross.riscv64.hello with the patches only included in cross-build glibc. It should be ready now. Sorry for the mess.

@thefloweringash thefloweringash force-pushed the thefloweringash:fixup-backport branch from 0998367 to b5a4510 Jan 11, 2020
Copy link
Member

@samueldr samueldr left a comment

Applied on top of 2d4f451 and it unclogged things.

nix-build -A pkgsCross.aarch64-multiplatform.hello

That's as far as my current testing goes, Mobile NixOS stage-1 is currently building.

@flokli flokli merged commit d08c6c7 into NixOS:staging Jan 13, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
glibc on aarch64-linux Success
Details
glibc on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
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
@samueldr samueldr mentioned this pull request Jan 13, 2020
4 of 10 tasks complete
@thefloweringash thefloweringash deleted the thefloweringash:fixup-backport branch Jan 13, 2020
@thefloweringash thefloweringash mentioned this pull request Jan 13, 2020
5 of 10 tasks complete
@nixos-discourse
Copy link

@nixos-discourse nixos-discourse commented Feb 5, 2020

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/january-2020-in-nixos/5771/1

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.

None yet

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