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

zlib: link with --undefined-version on lld #307540

Merged
merged 1 commit into from
May 7, 2024

Conversation

rhelmot
Copy link
Contributor

@rhelmot rhelmot commented Apr 28, 2024

Description of changes

zlib is one of many packages impacted by changes to lld's default flags, wherein it will throw errors unless linked with --undefined-verison or fixed to set its version info correctly. This does the former. This is necessary to build on freebsd.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Apr 28, 2024
@JohnRTitor
Copy link
Contributor

JohnRTitor commented Apr 28, 2024

Since this causes many rebuilds, shouldn't this be targeted to staging as per CONTRIBUTING.md?

@rhelmot rhelmot changed the base branch from master to staging April 28, 2024 20:48
@rhelmot
Copy link
Contributor Author

rhelmot commented Apr 28, 2024

Ah yes, sorry!

@JohnRTitor
Copy link
Contributor

Please do rebase this branch to staging, if not already.

@rhelmot
Copy link
Contributor Author

rhelmot commented Apr 28, 2024

done already

@rhelmot
Copy link
Contributor Author

rhelmot commented Apr 28, 2024

oh oops, I misunderstood your request. One sec

@rhelmot rhelmot force-pushed the freebsd-minimal2/zlib branch 2 times, most recently from f546ad3 to d78595a Compare April 28, 2024 20:55
@rhelmot
Copy link
Contributor Author

rhelmot commented Apr 28, 2024

Rebase didn't quite work, but cherry-pick did the trick.

@rhelmot rhelmot force-pushed the freebsd-minimal2/zlib branch from d78595a to 06cbdb9 Compare May 1, 2024 07:24
@rhelmot
Copy link
Contributor Author

rhelmot commented May 6, 2024

Bumping this - I linked the mentioned pull request from a comment in the diff.

@alyssais alyssais merged commit 6234b3e into NixOS:staging May 7, 2024
24 checks passed
@ghost ghost mentioned this pull request May 12, 2024
13 tasks
@rhelmot rhelmot deleted the freebsd-minimal2/zlib branch May 20, 2024 22:32
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants