[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 25/26] meson-buildoptions: include list of tracing backends
From: |
Paolo Bonzini |
Subject: |
[PULL 25/26] meson-buildoptions: include list of tracing backends |
Date: |
Thu, 14 Oct 2021 18:29:37 +0200 |
Manually patch the introspection data to include the tracing backends.
This works around a deficiency in Meson that will be fixed by
https://github.com/mesonbuild/meson/pull/9395.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
scripts/meson-buildoptions.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py
index 71ee56bd22..d48af99aaf 100755
--- a/scripts/meson-buildoptions.py
+++ b/scripts/meson-buildoptions.py
@@ -58,7 +58,23 @@ 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 14/26] configure, meson: move remaining HAVE_* compiler tests to Meson, (continued)
- [PULL 14/26] configure, meson: move remaining HAVE_* compiler tests to Meson, Paolo Bonzini, 2021/10/14
- [PULL 13/26] meson: HAVE_GDB_BIN is not used by C code, Paolo Bonzini, 2021/10/14
- [PULL 16/26] configure, meson: move libaio check to meson.build, Paolo Bonzini, 2021/10/14
- [PULL 15/26] configure, meson: move pthread_setname_np checks to Meson, Paolo Bonzini, 2021/10/14
- [PULL 17/26] configure, meson: move vde detection to meson, Paolo Bonzini, 2021/10/14
- [PULL 23/26] configure: accept "internal" for --enable-capstone/slirp/fdt, Paolo Bonzini, 2021/10/14
- [PULL 19/26] configure, meson: move Spice configure handling to meson, Paolo Bonzini, 2021/10/14
- [PULL 21/26] configure, meson: move more compiler checks to Meson, Paolo Bonzini, 2021/10/14
- [PULL 18/26] configure, meson: move netmap detection to meson, Paolo Bonzini, 2021/10/14
- [PULL 22/26] configure: remove deprecated --{enable, disable}-git-update, Paolo Bonzini, 2021/10/14
- [PULL 25/26] meson-buildoptions: include list of tracing backends,
Paolo Bonzini <=
- [PULL 24/26] configure: prepare for auto-generated option parsing, Paolo Bonzini, 2021/10/14
- [PULL 26/26] configure: automatically parse command line for meson -D options, Paolo Bonzini, 2021/10/14
- [PULL 20/26] configure: remove obsolete Solaris ar check, Paolo Bonzini, 2021/10/14
- Re: [PULL 00/26] Meson changes for 2021-10-14, Richard Henderson, 2021/10/14