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.

Sign up for GitHub

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

musl: pick upstream fixes and improvements #47308

Merged
merged 5 commits into from Sep 25, 2018
Merged

musl: pick upstream fixes and improvements #47308

merged 5 commits into from Sep 25, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Sep 25, 2018

Busy time for musl, lots of goodness and these are just select commits.

Hopefully next release isn't too far away :).

I don't remember which software we have that uses name_to_handle_at when
available, but I think udev does.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@dtzWill
musl: whitespace, NFC
ed53472
@dtzWill
musl: pick upstream patches for name_to_handle_at support
5c21759
@dtzWill
musl: pick getaddrinfo fix (containers)
dcd5e45
@dtzWill
musl: pick stacksize-related improvements, increase default size
f38218a 
Also supports setting default thread stack size via linker,
making it possible to fix programs without modifying source.
@dtzWill
musl: reduce stacksize patch series to just the bump
d3a0aa2 
The others rely on some of the recent restructuring+cleanup in musl,
which hopefully reaches us soon :).

For now just bump the default sizes.
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: musl

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/gjgvr7m6k8rlvwsmrjqaz7q42a82bd9c-musl-1.1.20-dev
patching script interpreter paths in /nix/store/gjgvr7m6k8rlvwsmrjqaz7q42a82bd9c-musl-1.1.20-dev
/nix/store/gjgvr7m6k8rlvwsmrjqaz7q42a82bd9c-musl-1.1.20-dev/bin/ld.musl-clang: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/gjgvr7m6k8rlvwsmrjqaz7q42a82bd9c-musl-1.1.20-dev/bin/musl-clang: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/gjgvr7m6k8rlvwsmrjqaz7q42a82bd9c-musl-1.1.20-dev/bin/musl-gcc: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/gjgvr7m6k8rlvwsmrjqaz7q42a82bd9c-musl-1.1.20-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/y5g75az8cirknbjivymzck81mg8dgbr5-musl-1.1.20-debug
patching script interpreter paths in /nix/store/y5g75az8cirknbjivymzck81mg8dgbr5-musl-1.1.20-debug
checking for references to /build in /nix/store/y5g75az8cirknbjivymzck81mg8dgbr5-musl-1.1.20-debug...
/nix/store/34lwq1sp4rbrll9mclayy72m5dqhi57s-musl-1.1.20

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: musl

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: musl

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/40cn3a7gkpfia8v2hpw5anga87ya04y8-musl-1.1.20-dev
patching script interpreter paths in /nix/store/40cn3a7gkpfia8v2hpw5anga87ya04y8-musl-1.1.20-dev
/nix/store/40cn3a7gkpfia8v2hpw5anga87ya04y8-musl-1.1.20-dev/bin/musl-gcc: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/40cn3a7gkpfia8v2hpw5anga87ya04y8-musl-1.1.20-dev/bin/ld.musl-clang: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/40cn3a7gkpfia8v2hpw5anga87ya04y8-musl-1.1.20-dev/bin/musl-clang: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/40cn3a7gkpfia8v2hpw5anga87ya04y8-musl-1.1.20-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/3nln9yxc7jh2g5w48hq04g8m8b365kfi-musl-1.1.20-debug
patching script interpreter paths in /nix/store/3nln9yxc7jh2g5w48hq04g8m8b365kfi-musl-1.1.20-debug
checking for references to /build in /nix/store/3nln9yxc7jh2g5w48hq04g8m8b365kfi-musl-1.1.20-debug...
/nix/store/g814scmccnxxwmpy65s3njav75x3h53i-musl-1.1.20

@dtzWill
Copy link
Member Author

dtzWill commented Sep 25, 2018

@GrahamcOfBorg nix

@dtzWill dtzWill merged commit f02c8e2 into NixOS:master Sep 25, 2018
@dtzWill dtzWill deleted the update/musl-upstream-fixes branch September 25, 2018 05:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@dtzWill @GrahamcOfBorg