mirror of https://gitee.com/openkylin/qemu.git
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>
This commit is contained in:
parent
fccec5ce17
commit
6638cae5f6
|
@ -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
|
||||
|
|
2
meson
2
meson
|
@ -1 +1 @@
|
|||
Subproject commit b25d94e7c77fda05a7fdfe8afe562cf9760d69da
|
||||
Subproject commit 12f9f04ba0decfda425dbbf9a501084c153a2d18
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue