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: 1.1.19 -> 1.1.20 #46064

Merged
merged 1 commit into from Sep 9, 2018
Merged

musl: 1.1.19 -> 1.1.20 #46064

merged 1 commit into from Sep 9, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Sep 4, 2018

Announcement: http://www.openwall.com/lists/musl/2018/09/04/17
Release commit (adds release notes to WHATSNEW): https://git.musl-libc.org/cgit/musl/commit/?h=v1.1.20&id=0fa1e638e87cf257e9f96b4019b2076afd674a19

  • 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.

The hydra instance powering my musl build-fleet died a few weeks ago
and as a result I haven't tested the impact this has on all-the-things
(esp in terms of various cross-compilation scenarios).

Many of these fixes are worthy of having been picked but it always
seemed a release was happening soon... :D

See the notes and commit logs for more details.

@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/arh9dvng5c40rrggi8mz6kpz0rlq287p-musl-1.1.20-dev
patching script interpreter paths in /nix/store/arh9dvng5c40rrggi8mz6kpz0rlq287p-musl-1.1.20-dev
/nix/store/arh9dvng5c40rrggi8mz6kpz0rlq287p-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/arh9dvng5c40rrggi8mz6kpz0rlq287p-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/arh9dvng5c40rrggi8mz6kpz0rlq287p-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/arh9dvng5c40rrggi8mz6kpz0rlq287p-musl-1.1.20-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/ir16rhg411ndbaqscbwsczl049w1vaw8-musl-1.1.20-debug
patching script interpreter paths in /nix/store/ir16rhg411ndbaqscbwsczl049w1vaw8-musl-1.1.20-debug
checking for references to /build in /nix/store/ir16rhg411ndbaqscbwsczl049w1vaw8-musl-1.1.20-debug...
/nix/store/rp48h2ndc4giv9i2q1knzl0w2y5bkdn8-musl-1.1.20

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: musl

Partial log (click to expand)

wrong ELF type
shrinking RPATHs of ELF executables and libraries in /nix/store/xiavjw941gdmiv21d5dmm1l31dih1kr1-musl-1.1.20-dev
patching script interpreter paths in /nix/store/xiavjw941gdmiv21d5dmm1l31dih1kr1-musl-1.1.20-dev
/nix/store/xiavjw941gdmiv21d5dmm1l31dih1kr1-musl-1.1.20-dev/bin/musl-clang: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/xiavjw941gdmiv21d5dmm1l31dih1kr1-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/xiavjw941gdmiv21d5dmm1l31dih1kr1-musl-1.1.20-dev/bin/musl-gcc: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/xiavjw941gdmiv21d5dmm1l31dih1kr1-musl-1.1.20-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/94694jpfy1ys3riavr7f1c6ymzhmkxkb-musl-1.1.20-debug
patching script interpreter paths in /nix/store/94694jpfy1ys3riavr7f1c6ymzhmkxkb-musl-1.1.20-debug
checking for references to /build in /nix/store/94694jpfy1ys3riavr7f1c6ymzhmkxkb-musl-1.1.20-debug...

@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)

Cannot nix-instantiate `musl' because:
error: while evaluating 'callPackageWith' at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:108:35, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:14380:10:
while evaluating 'makeOverridable' at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:67:24, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:112:8:
while evaluating anonymous function at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/musl/default.nix:1:1, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:69:12:
while evaluating 'mkDerivation' at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/stdenv/generic/make-derivation.nix:15:5, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/musl/default.nix:30:1:
while evaluating 'extendDerivation' at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:130:43, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/stdenv/generic/make-derivation.nix:289:7:
while evaluating anonymous function at /nix/store/pdf79djwmadbzbxzgd3dyc259h1n4hb5-nix-2.0.4/share/nix/corepkgs/derivation.nix:4:1, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/stdenv/generic/make-derivation.nix:299:10:
assertion failed at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/stdenv/generic/make-derivation.nix:88:36

@dtzWill
Copy link
Member Author

dtzWill commented Sep 9, 2018

I have fixes/cleanup for packages impacted by this when building musl-native, but even so they're minor (and often are the things we'll be doing for glibc 2.28 re:memfd_create, I believe) and been using this in my own work and LGTM.

@dtzWill
Copy link
Member Author

dtzWill commented Sep 9, 2018

cc NixOS/rfcs#23 (subscribers to that may be interested in testing/feedback here--even post-merge).

@dtzWill dtzWill merged commit 4278319 into NixOS:master Sep 9, 2018
@dtzWill dtzWill deleted the update/musl-1.1.20 branch September 9, 2018 22:31
@nh2 nh2 mentioned this pull request Sep 11, 2018
Closed
@nh2
Copy link
Contributor

nh2 commented Sep 11, 2018

@dtzWill seems to break GCC for me: nh2/static-haskell-nix#6

@nh2 nh2 mentioned this pull request Sep 11, 2018
Merged
@dtzWill
Copy link
Member Author

dtzWill commented Jan 21, 2019

FWIW another bump on the way: #54440 -- LMK if you end up testing it, problems or no :).

@dtzWill dtzWill mentioned this pull request Apr 13, 2019
Merged
10 tasks
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
3 participants
@dtzWill @GrahamcOfBorg @nh2