[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/27] meson: bump submodule to 0.59.3
From: |
Paolo Bonzini |
Subject: |
[PULL 21/27] meson: bump submodule to 0.59.3 |
Date: |
Wed, 3 Nov 2021 16:04:36 +0100 |
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>
---
configure | 2 +-
meson | 2 +-
scripts/meson-buildoptions.py | 16 ----------------
3 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/configure b/configure
index c0018a304f..73af9a7b30 100755
--- a/configure
+++ b/configure
@@ -1500,7 +1500,7 @@ python_version=$($python -c 'import sys; print("%d.%d.%d"
% (sys.version_info[0]
python="$python -B"
if test -z "$meson"; then
- if test "$explicit_python" = no && has meson && version_ge "$(meson
--version)" 0.59.2; then
+ if test "$explicit_python" = no && has meson && version_ge "$(meson
--version)" 0.59.3; then
meson=meson
elif test $git_submodules_action != 'ignore' ; then
meson=git
diff --git a/meson b/meson
index b25d94e7c7..12f9f04ba0 160000
--- a/meson
+++ b/meson
@@ -1 +1 @@
-Subproject commit b25d94e7c77fda05a7fdfe8afe562cf9760d69da
+Subproject commit 12f9f04ba0decfda425dbbf9a501084c153a2d18
diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py
index 256523c09d..96969d89ee 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)
--
2.31.1
- [PULL 27/27] configure: fix --audio-drv-list help message, (continued)
- [PULL 27/27] configure: fix --audio-drv-list help message, Paolo Bonzini, 2021/11/03
- [PULL 14/27] watchdog: add information from -watchdog help to -device help, Paolo Bonzini, 2021/11/03
- [PULL 22/27] meson.build: Allow to disable OSS again, Paolo Bonzini, 2021/11/03
- [PULL 23/27] meson: remove pointless warnings, Paolo Bonzini, 2021/11/03
- [PULL 24/27] meson: remove unnecessary coreaudio test program, Paolo Bonzini, 2021/11/03
- [PULL 19/27] esp: ensure in-flight SCSI requests are always cancelled, Paolo Bonzini, 2021/11/03
- [PULL 20/27] qtest/am53c974-test: add test for cancelling in-flight requests, Paolo Bonzini, 2021/11/03
- [PULL 16/27] watchdog: remove select_watchdog_action, Paolo Bonzini, 2021/11/03
- [PULL 13/27] hw/i386: Rename default_bus_bypass_iommu, Paolo Bonzini, 2021/11/03
- [PULL 18/27] KVM: SVM: add migration support for nested TSC scaling, Paolo Bonzini, 2021/11/03
- [PULL 21/27] meson: bump submodule to 0.59.3,
Paolo Bonzini <=
- [PULL 25/27] Move the l2tpv3 test from configure to meson.build, Paolo Bonzini, 2021/11/03
- Re: [PULL 00/27] Misc patches for QEMU 6.2 soft freeze, Richard Henderson, 2021/11/04