elfutils: rebase cxx-header-collision.patch, fix for FreeBSD#415087
Closed
rhelmot wants to merge 2 commits intoNixOS:stagingfrom
Closed
elfutils: rebase cxx-header-collision.patch, fix for FreeBSD#415087rhelmot wants to merge 2 commits intoNixOS:stagingfrom
rhelmot wants to merge 2 commits intoNixOS:stagingfrom
Conversation
|
The PR's base branch is set to master, but 516 commits from the python-updates branch are included. Make sure you know the right base branch for your changes, then:
|
Contributor
Author
|
"haha", she thought, "this patch does not affect linux or darwin, so it can go straight to master!" Unfortunately, she did not realize that the relevant version of elfutils had not yet reached master. I also had to add an additional commit that actually fixes the freebsd build. It is, unfortunately, an enormous mess. |
Contributor
|
With #419451 it looks like the cxx-header-collision patch isn't needed? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Do #370365 again, this time for the 0.193 update.
This was generated by, best I can tell, re-doing the process of creating this patch on top of the 0.193 branch.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.