boost: fix taxonomy mistake, account taxonomy change in v1.78#168573
Merged
SuperSandro2000 merged 1 commit intomasterfrom Apr 15, 2022
unknown repository
Merged
boost: fix taxonomy mistake, account taxonomy change in v1.78#168573SuperSandro2000 merged 1 commit intomasterfrom unknown repository
SuperSandro2000 merged 1 commit intomasterfrom
unknown repository
Conversation
ofborg
bot
added
10.rebuild-darwin: 0
ghost
changed the title
This commit makes two changes: 1. Boost changed its taxonomy for architecture names between the 1.77 and 1.78 releases, in this commit: boostorg/context@6edc818 2. During the review of #161162 I [was asked about][1] the source of the [mips64-context.patch][2] that I had included in the original version of the PR. I searched through the boost-context revision history and found [a nearly identical patch][3], which I substituted in the final, merged version of the PR. As it turns out, my [mips64-context.patch][2] was an earlier revision of what was eventually accepted to boost-context. The only difference between the two patches is the name they use: mips64 vs mips1. When switching to the accepted version of the boost patch, I should have also updated libraries/boost/generic.nix to change mips64 to mips1. This commit does that. [1]: #161162 (comment) [2]: https://raw.githubusercontent.com/a-m-joseph/nixpkgs/1ca5025945470ce96408552b9117674b12efaf04/pkgs/development/libraries/boost/mips64-context.patch [3]: https://github.com/boostorg/context/commit/e3f744a1862164062d579d1972272d67bdaa9c39.patch
ghost
marked this pull request as ready for review
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
1 participant
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.
Description of changes
This commit makes two changes:
Boost changed its taxonomy for architecture names between the 1.77 and 1.78 releases, in this commit.
During the review of boost: support for cross-compiling to mips64el #161162 I was asked about the source of the mips64-context.patch that I had included in the original version of the PR. I searched through the boost-context revision history and found a nearly identical patch, which I substituted in the final, merged version of the PR.
As it turns out, my mips64-context.patch was an earlier revision of what was eventually accepted to boost-context. The only difference between the two patches is the name they use: mips64 vs mips1.
When switching to the accepted version of the boost patch, I should have also updated libraries/boost/generic.nix to change mips64 to mips1. This commit does that.
Things done
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)