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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

musl: 1.1.17 -> 1.1.18 #31057

Merged
merged 1 commit into from Nov 2, 2017
Merged

musl: 1.1.17 -> 1.1.18 #31057

merged 1 commit into from Nov 2, 2017

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Oct 31, 2017

Use this as an opportunity to remove empty patches array.

Motivation for this change

Minor update.
Includes fix particularly relevant for Nix users where large PATH entries overflowed the stack and badness resulted:
https://git.musl-libc.org/cgit/musl/commit/?id=004dc9549b8003288e635ba5aa91e3353e1974c4
The commit author is also super cool 馃槆.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

Checked nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test

Use this as an opportunity to remove
empty patches array.
@grahamc
Copy link
Member

grahamc commented Oct 31, 2017

@GrahamcOfBorg musl

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

For system: x86_64-linux

stripping (with flags -S) in /nix/store/f6b0micv8wyzxi0mx5v0khkrajgfc0k2-musl-1.1.18/lib  /nix/store/f6b0micv8wyzxi0mx5v0khkrajgfc0k2-musl-1.1.18/bin
patching script interpreter paths in /nix/store/f6b0micv8wyzxi0mx5v0khkrajgfc0k2-musl-1.1.18
/nix/store/f6b0micv8wyzxi0mx5v0khkrajgfc0k2-musl-1.1.18/bin/musl-gcc: interpreter directive changed from "/bin/sh" to "/nix/store/h404wfcz8rzzlq8vr4z7plcijwzfci72-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-musl-1.1.18.drv-0 in /nix/store/f6b0micv8wyzxi0mx5v0khkrajgfc0k2-musl-1.1.18...
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
/nix/store/f6b0micv8wyzxi0mx5v0khkrajgfc0k2-musl-1.1.18

@disassembler disassembler requested review from svanderburg and removed request for svanderburg October 31, 2017 23:51
@Mic92 Mic92 merged commit 5cfd049 into NixOS:master Nov 2, 2017
@Mic92
Copy link
Member

Mic92 commented Nov 2, 2017

Should we backport this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants