From 6638cae5f65c5f6fb312ef6f1635b29d2fd056aa Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 27 Oct 2021 15:18:48 +0200 Subject: 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 Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- scripts/meson-buildoptions.py | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'scripts') 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) -- cgit v1.1 From eea9453a016b622f74898809f53e0ca85961cd80 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 28 Oct 2021 20:59:08 +0200 Subject: Move the l2tpv3 test from configure to meson.build And while we're at it, also provide a proper entry for this feature in meson_options.txt, so that people who don't need it have a knob to disable this feature. Signed-off-by: Thomas Huth Message-Id: <20211028185910.1729744-3-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/meson-buildoptions.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts') diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index c795a13..55b8a78 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -49,6 +49,7 @@ meson_options_help() { printf "%s\n" ' iconv Font glyph conversion support' printf "%s\n" ' jack JACK sound support' printf "%s\n" ' kvm KVM acceleration support' + printf "%s\n" ' l2tpv3 l2tpv3 network backend support' printf "%s\n" ' libdaxctl libdaxctl support' printf "%s\n" ' libiscsi libiscsi userspace initiator' printf "%s\n" ' libnfs libnfs block device driver' @@ -166,6 +167,8 @@ _meson_option_parse() { --disable-jack) printf "%s" -Djack=disabled ;; --enable-kvm) printf "%s" -Dkvm=enabled ;; --disable-kvm) printf "%s" -Dkvm=disabled ;; + --enable-l2tpv3) printf "%s" -Dl2tpv3=enabled ;; + --disable-l2tpv3) printf "%s" -Dl2tpv3=disabled ;; --enable-libdaxctl) printf "%s" -Dlibdaxctl=enabled ;; --disable-libdaxctl) printf "%s" -Dlibdaxctl=disabled ;; --enable-libiscsi) printf "%s" -Dlibiscsi=enabled ;; -- cgit v1.1