accept subproject whose wraps cause duplicate provides #15405
+33
−6
Conversation
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
bonzini
force-pushed
the
fix15175
branch
2 times, most recently
from
ce7bdd1 to
e8cab48
Compare
Since commit 56e84d3, add_wrap is called instead of using setdefault() by hand. However, this causes the error for "Multiple wrap files provide..." to trigger incorrectly. To avoid this add a flag to add_wrap() that signals that the add is part of _merge_wraps. However, like after commit 56e84d3, do not add the "provides" unless the wrap itself is used. This ensures that the "provides" set is synchronized with the meson.build file that will be used. Testcase by George Sedov. Fixes: mesonbuild#15175 Signed-off-by: Paolo Bonzini <[email protected]>
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.
Since commit 56e84d3, add_wrap is called instead of using setdefault() by hand. However, this causes the error for "Multiple wrap files provide..." to trigger incorrectly. To avoid this add a flag to
add_wrap()that signals that the add is part of_merge_wraps.However, like after commit 56e84d3, do not add the "provides" unless the wrap itself is used. This ensures that the "provides" set is synchronized with the meson.build file that will be used.
Testcase by George Sedov.
Fixes: #15175