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

Jump to bottom

glibc: fix cross compilation build failure (again) #77525

Merged
merged 2 commits into from Jan 13, 2020
Merged

glibc: fix cross compilation build failure (again) #77525

merged 2 commits into from Jan 13, 2020

Conversation

thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Jan 11, 2020 •
edited

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.

@jonringer jonringer requested review from Ma27 and flokli January 11, 2020 20:54
@flokli
Copy link
Contributor

flokli commented Jan 11, 2020

@thefloweringash can this be rebased on latest staging?

@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 January 11, 2020 21:23
@thefloweringash thefloweringash marked this pull request as ready for review January 11, 2020 21:37
@thefloweringash
Copy link
Member Author

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.

samueldr
samueldr approved these changes Jan 13, 2020
View reviewed changes
Copy link
Member

@samueldr samueldr left a comment

Choose a reason for hiding this comment

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

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
@samueldr samueldr mentioned this pull request Jan 13, 2020
Merged
10 tasks
@thefloweringash thefloweringash deleted the fixup-backport branch January 13, 2020 16:09
@thefloweringash thefloweringash mentioned this pull request Jan 13, 2020
Closed
10 tasks
@golddranks golddranks mentioned this pull request Jan 27, 2020
Closed
@nixos-discourse
Copy link

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
Reviewers

@samueldr samueldr samueldr approved these changes

@Ma27 Ma27 Awaiting requested review from Ma27

@flokli flokli Awaiting requested review from flokli

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@thefloweringash @flokli @nixos-discourse @samueldr