Make configuration accept unknown-but-maybe-valid-in-the-future options #14624
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
classify_D_arguments returns a list with OptionKeys in it. Rename the function so that the difference with set_option is clear. Signed-off-by: Paolo Bonzini <[email protected]>
The check for unknown options is duplicated in OptionStore and MesonApp. Place the better version of the two as a new method of OptionStore, and use it in OptionStore.validate_cmd_line_options. Signed-off-by: Paolo Bonzini <[email protected]>
…eson configure" Follow the same logic that is used at the end of the first invocation. This fixes meson setup --reconfigure -Db_ndebug=true on a project that has no language that defines b_ndebug. Signed-off-by: Paolo Bonzini <[email protected]>
Make more of the first-invocation logic apply to subsequent configuration of the build tree. This also opens the door for using set_option_maybe_root for the first invocation. This is a huge cleanup but also a larger change, and therefore not something for stable branches. Leave it for later. Signed-off-by: Paolo Bonzini <[email protected]>
bruchar1
reviewed
May 20, 2025
eli-schwartz
approved these changes
May 22, 2025
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.
This fixes #14615, which is reported as a 1.8.1 regression but was actually reproducible even before with
meson configure(instead ofmeson setup --reconfigure).It's not trivial fix, though in the end the code becomes almost simpler. The crux of the issue is the disagreement between
OptionStore.validate_cmd_line_options,MesonApp.check_unused_optionsandOptionStore.set_option_from_string. Place the desired semantics (mostly those fromcheck_unused_options) in a new function so that the three share the same logic.Fixes: #14615