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

libglvnd: patch from upstream for libdl #38170

Merged
merged 1 commit into from Mar 31, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 31, 2018

Merged upstream as part of fixes for BSD's,
but also is right thing w/musl.

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

@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: libglvnd

Partial log (click to expand)


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

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


@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: libglvnd

Partial log (click to expand)

shrinking /nix/store/8mmr9wr9nc4qdqifdsg96b67va0da03h-libglvnd-1.0.0/lib/libGLESv2.so.2.0.0
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/8mmr9wr9nc4qdqifdsg96b67va0da03h-libglvnd-1.0.0/lib
patching script interpreter paths in /nix/store/8mmr9wr9nc4qdqifdsg96b67va0da03h-libglvnd-1.0.0
checking for references to /build in /nix/store/8mmr9wr9nc4qdqifdsg96b67va0da03h-libglvnd-1.0.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/lghzc3szdhlx1b1jdg118c2gx4wickyi-libglvnd-1.0.0-dev
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/lghzc3szdhlx1b1jdg118c2gx4wickyi-libglvnd-1.0.0-dev/lib
patching script interpreter paths in /nix/store/lghzc3szdhlx1b1jdg118c2gx4wickyi-libglvnd-1.0.0-dev
checking for references to /build in /nix/store/lghzc3szdhlx1b1jdg118c2gx4wickyi-libglvnd-1.0.0-dev...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: libglvnd

Partial log (click to expand)

strip is /nix/store/j7d4mr0ikv974ig7yzhknpsq288js4bs-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/c4fpjq06qcb84q5jq76dpb71pgmy72lk-libglvnd-1.0.0/lib
patching script interpreter paths in /nix/store/c4fpjq06qcb84q5jq76dpb71pgmy72lk-libglvnd-1.0.0
checking for references to /build in /nix/store/c4fpjq06qcb84q5jq76dpb71pgmy72lk-libglvnd-1.0.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/wd7m43z7xlbkmxjxraj3ax2bx632fkmq-libglvnd-1.0.0-dev
strip is /nix/store/j7d4mr0ikv974ig7yzhknpsq288js4bs-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/wd7m43z7xlbkmxjxraj3ax2bx632fkmq-libglvnd-1.0.0-dev/lib
patching script interpreter paths in /nix/store/wd7m43z7xlbkmxjxraj3ax2bx632fkmq-libglvnd-1.0.0-dev
checking for references to /build in /nix/store/wd7m43z7xlbkmxjxraj3ax2bx632fkmq-libglvnd-1.0.0-dev...
/nix/store/c4fpjq06qcb84q5jq76dpb71pgmy72lk-libglvnd-1.0.0

@dtzWill dtzWill merged commit 6096a4d into NixOS:staging Mar 31, 2018
@dtzWill dtzWill deleted the fix/libglvnd-libdl-from-upstream branch March 31, 2018 05:53
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

2 participants