Skip to content

llvm_18, lld_18: Patch to support more OpenBSD sections#326644

Merged
Ericson2314 merged 1 commit intoNixOS:stagingfrom
obsidiansystems:openbsd-llvm
Jul 16, 2024
Merged

llvm_18, lld_18: Patch to support more OpenBSD sections#326644
Ericson2314 merged 1 commit intoNixOS:stagingfrom
obsidiansystems:openbsd-llvm

Conversation

@Ericson2314
Copy link
Member

Description of changes

Without these backports (I've ensured everything has landed upstream) the OpenBSD binaries we build will not run.

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.11 Release Notes (or backporting 23.11 and 24.05 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.

Without these backports (I've ensured everything has landed upstream)
the OpenBSD binaries we build will not run.
@github-actions github-actions bot added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label Jul 12, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 13, 2024
@Ericson2314
Copy link
Member Author

Ah, now that Rust uses LLVM 18, we need to go to staging.

@Ericson2314 Ericson2314 changed the base branch from master to staging July 16, 2024 19:43
@Ericson2314 Ericson2314 merged commit 8f8c3c9 into NixOS:staging Jul 16, 2024
@Ericson2314 Ericson2314 deleted the openbsd-llvm branch July 16, 2024 20:07
@github-actions
Copy link
Contributor

Backport failed for staging-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-24.05
git worktree add -d .worktree/backport-326644-to-staging-24.05 origin/staging-24.05
cd .worktree/backport-326644-to-staging-24.05
git switch --create backport-326644-to-staging-24.05
git cherry-pick -x 62a46e824bb9d1059223d2918fb7e4f6acad31b2

@Ericson2314
Copy link
Member Author

Time to wait for #329706 and then try backporting.

@github-actions
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-326644-to-release-24.05 origin/release-24.05
cd .worktree/backport-326644-to-release-24.05
git switch --create backport-326644-to-release-24.05
git cherry-pick -x 62a46e824bb9d1059223d2918fb7e4f6acad31b2

@Ericson2314
Copy link
Member Author

#329815 Manual backport instead,

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+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant