aboutsummaryrefslogtreecommitdiff
path: root/scripts/meson-buildoptions.py
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-10-27 15:18:48 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2021-11-02 15:57:28 +0100
commit6638cae5f65c5f6fb312ef6f1635b29d2fd056aa (patch)
treef6d217e4134badb0beee509d931060b1bf503e6c /scripts/meson-buildoptions.py
parentfccec5ce171b66850b5882488a64d6ffd1131d2e (diff)
downloadqemu-6638cae5f65c5f6fb312ef6f1635b29d2fd056aa.zip
qemu-6638cae5f65c5f6fb312ef6f1635b29d2fd056aa.tar.gz
qemu-6638cae5f65c5f6fb312ef6f1635b29d2fd056aa.tar.bz2
meson: bump submodule to 0.59.3
This gains some bugfixes, especially: - it fixes the introspection of array options. While technically we still support Meson 0.58.2, this issue only appears when adding a new option and not if the user is just building QEMU. In the relatively rare case of a contributor using --meson to point to a 0.58 version, review can catch spurious changes to scripts/meson-buildoptions.sh easily. - it fixes "meson test" when it is not the process group leader. Make is the process group leader when "make check" invokes "meson test", so this is a requirement for using it as a test harness. Tested-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scripts/meson-buildoptions.py')
-rwxr-xr-xscripts/meson-buildoptions.py16
1 files changed, 0 insertions, 16 deletions
diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py
index 256523c..96969d8 100755
--- a/scripts/meson-buildoptions.py
+++ b/scripts/meson-buildoptions.py
@@ -150,23 +150,7 @@ def print_parse(options):
print("}")
-def fixup_options(options):
- # Meson <= 0.60 does not include the choices in array options, fix that up
- for opt in options:
- if opt["name"] == "trace_backends":
- opt["choices"] = [
- "dtrace",
- "ftrace",
- "log",
- "nop",
- "simple",
- "syslog",
- "ust",
- ]
-
-
options = load_options(json.load(sys.stdin))
-fixup_options(options)
print("# This file is generated by meson-buildoptions.py, do not edit!")
print_help(options)
print_parse(options)