Options fixes :'( #14730
Open
Options fixes :'( #14730
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
fix14728-14729
branch
2 times, most recently
from
dc03bf4 to
9898df4
Compare
bonzini
force-pushed
the
fix14728-14729
branch
2 times, most recently
from
a538c87 to
3399ea1
Compare
As shown in the test, "-Dtests=true" should not override the subproject() call because tests is a project options and those do not share a namespace. Fixes: mesonbuild#14728 Signed-off-by: Paolo Bonzini <[email protected]>
Remove knowledge of the internal pending_options from msetup; operate on the command line and check against the option store. Signed-off-by: Paolo Bonzini <[email protected]>
Reserve pending_options for those that could appear later in the configuration process. Options are added there only if accept_as_pending_option() is true. This is a preparation for changing the code so that it checks pending_options for subprojects as well. Signed-off-by: Paolo Bonzini <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
Fixes: 8dcc9d3 ("options: accept compiler and built-in options in --reconfigure and "meson configure"", 2025-05-21 Signed-off-by: Paolo Bonzini <[email protected]>
Remove all the special casing and late validation now that early augments are stored in pending_options until the subproject is found. As a result, this makes the buildtype special case operate on subprojects as well. It also simplifies set_from_configure_command(), which does not have to treat various kinds of options in different ways. Fixes: mesonbuild#14729 Signed-off-by: Paolo Bonzini <[email protected]>
Restore behavior of 1.7. Signed-off-by: Paolo Bonzini <[email protected]>
…by subproject This is already done most of the time for default_library but not in these cases. Signed-off-by: Paolo Bonzini <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
bgilbert
reviewed
Jun 23, 2025
docs/yaml/functions/project.yaml
Outdated
| @@ -56,6 +54,10 @@ kwargs: | |||
|
|
|||
| *(since 1.2.0)*: A dictionary may now be passed. | |||
|
|
|||
| *(since 1.8.0): all global options, such as `buildtype`, are taken | |||
There was a problem hiding this comment.
all global options is too strong, given the other changes.
Signed-off-by: Paolo Bonzini <[email protected]>
bgilbert
reviewed
Jun 23, 2025
Co-authored-by: Benjamin Gilbert <[email protected]>
Co-authored-by: Benjamin Gilbert <[email protected]>
|
Docs look good. Thanks for all the fixes! |
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.
At least the code becomes (mostly) simpler, as it's now able to handle toplevel and subproject options more uniformly.
Fixes: #14728
Fixes: #14729