Restore 1.8.x behavior of yielding options #14800
Merged
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
fix14796
branch
3 times, most recently
from
b8a0046 to
61ecb87
Compare
|
This is quite a big change in how However, the semantics of |
This makes it possible to adjust the value of the option with a
subproject-specific augment. This was an undocumented change in 1.8
which was (voluntarily) undone in commit eae4efa72 ("options: resolve
yielding options at the time they are added", 2025-07-13), but is
useful. This reimplementation of yielding options makes it possible
to presreve the bugfix while restoring this new feature.
Reported-by: Nirbheek Chauhan <nirbheek@centricular.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
bonzini
force-pushed
the
fix14796
branch
2 times, most recently
from
fb65525 to
405e6b1
Compare
dcbaker
approved these changes
Jul 17, 2025
…on is set" This reverts commit 9ad10ee. The "if" in set_option() was removed, because get_key_and_value_object_for now always returns the subproject key and option object; remove the function as well. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
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.
Meson 1.8.x makes it possible to adjust the value of a yielding option with a subproject-specific augment. This was an undocumented change which was (voluntarily) undone in commit eae4efa72 ("options: resolve yielding options at the time they are added", 2025-07-13).
Since it is useful, try to preserve it by reimplementing yielding options: store a link to the parent project option, and undo it if
set_optionoverrides it.Because UserOption lookup now never checks
yielding, this avoids the issue from #14774 too.