From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Pierrick Bouvier" <pierrick.bouvier@oss.qualcomm.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH] meson: refresh build options script
Date: Tue, 8 Sep 2026 08:40:16 +0100 [thread overview]
Message-ID: <20260908074016.2143292-1-berrange@redhat.com> (raw)
Recent changes added more meson options, but missed refreshing of
the meson-buildoptions.sh file, causing it to frequently appear
dirty when doing builds.
Fixes: 7e1d54da6faf (tests/tcg/meson.build: implement ./configure -cross-cc-* options)
Fixes: 522b299ca431 (tests/tcg/meson.build: implement ./configure containers options)
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
scripts/meson-buildoptions.sh | 138 ++++++++++++++++++++++++++++++++++
1 file changed, 138 insertions(+)
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index 5a67e59a16..eb15551286 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -10,7 +10,10 @@ meson_options_help() {
printf "%s\n" ' --block-drv-rw-whitelist=VALUE'
printf "%s\n" ' set block driver read-write whitelist (by default'
printf "%s\n" ' affects only QEMU, not tools like qemu-img)'
+ printf "%s\n" ' --container-command=VALUE'
+ printf "%s\n" ' command to build/run containers'
printf "%s\n" ' --datadir=VALUE Data file directory [share]'
+ printf "%s\n" ' --disable-containers use containers to cross compile tcg tests'
printf "%s\n" ' --disable-coroutine-pool coroutine freelist (better performance)'
printf "%s\n" ' --disable-debug-info Enable debug symbols and other information'
printf "%s\n" ' --disable-hexagon-idef-parser'
@@ -77,6 +80,94 @@ meson_options_help() {
printf "%s\n" ' --rtsig-map=VALUE default value of QEMU_RTSIG_MAP [NULL]'
printf "%s\n" ' --smbd=VALUE Path to smbd for slirp networking'
printf "%s\n" ' --sysconfdir=VALUE Sysconf data directory [etc]'
+ printf "%s\n" ' --tcg-tests-cross-cc-aarch64=VALUE'
+ printf "%s\n" ' cc for aarch64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-aarch64-be=VALUE'
+ printf "%s\n" ' cc for aarch64_be tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-alpha=VALUE'
+ printf "%s\n" ' cc for alpha tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-arm=VALUE'
+ printf "%s\n" ' cc for arm tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-hexagon=VALUE'
+ printf "%s\n" ' cc for hexagon tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-hppa=VALUE'
+ printf "%s\n" ' cc for hppa tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-i386=VALUE'
+ printf "%s\n" ' cc for i386 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-loongarch64=VALUE'
+ printf "%s\n" ' cc for loongarch64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-m68k=VALUE'
+ printf "%s\n" ' cc for m68k tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-mips=VALUE'
+ printf "%s\n" ' cc for mips tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-mips64=VALUE'
+ printf "%s\n" ' cc for mips64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-mips64el=VALUE'
+ printf "%s\n" ' cc for mips64el tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-or1k=VALUE'
+ printf "%s\n" ' cc for or1k tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-ppc64=VALUE'
+ printf "%s\n" ' cc for ppc64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-ppc64le=VALUE'
+ printf "%s\n" ' cc for ppc64le tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-riscv64=VALUE'
+ printf "%s\n" ' cc for riscv64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-s390x=VALUE'
+ printf "%s\n" ' cc for s390x tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-sh4=VALUE'
+ printf "%s\n" ' cc for sh4 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-tricore=VALUE'
+ printf "%s\n" ' cc for tricore tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-x86-64=VALUE'
+ printf "%s\n" ' cc for x86_64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-xtensa=VALUE'
+ printf "%s\n" ' cc for xtensa tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cc-xtensaeb=VALUE'
+ printf "%s\n" ' cc for xtensaeb tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-aarch64=VALUE'
+ printf "%s\n" ' cflags for aarch64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-aarch64-be=VALUE'
+ printf "%s\n" ' cflags for aarch64_be tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-alpha=VALUE'
+ printf "%s\n" ' cflags for alpha tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-arm=VALUE'
+ printf "%s\n" ' cflags for arm tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-hexagon=VALUE'
+ printf "%s\n" ' cflags for hexagon tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-hppa=VALUE'
+ printf "%s\n" ' cflags for hppa tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-i386=VALUE'
+ printf "%s\n" ' cflags for i386 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-loongarch64=VALUE'
+ printf "%s\n" ' cflags for loongarch64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-m68k=VALUE'
+ printf "%s\n" ' cflags for m68k tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-mips=VALUE'
+ printf "%s\n" ' cflags for mips tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-mips64=VALUE'
+ printf "%s\n" ' cflags for mips64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-mips64el=VALUE'
+ printf "%s\n" ' cflags for mips64el tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-or1k=VALUE'
+ printf "%s\n" ' cflags for or1k tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-ppc64=VALUE'
+ printf "%s\n" ' cflags for ppc64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-ppc64le=VALUE'
+ printf "%s\n" ' cflags for ppc64le tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-riscv64=VALUE'
+ printf "%s\n" ' cflags for riscv64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-s390x=VALUE'
+ printf "%s\n" ' cflags for s390x tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-sh4=VALUE'
+ printf "%s\n" ' cflags for sh4 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-tricore=VALUE'
+ printf "%s\n" ' cflags for tricore tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-x86-64=VALUE'
+ printf "%s\n" ' cflags for x86_64 tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-xtensa=VALUE'
+ printf "%s\n" ' cflags for xtensa tcg tests'
+ printf "%s\n" ' --tcg-tests-cross-cflags-xtensaeb=VALUE'
+ printf "%s\n" ' cflags for xtensaeb tcg tests'
printf "%s\n" ' --tls-priority=VALUE Default TLS protocol/cipher priority string'
printf "%s\n" ' [NORMAL]'
printf "%s\n" ' --with-coroutine=CHOICE coroutine backend to use (choices:'
@@ -281,6 +372,9 @@ _meson_option_parse() {
--disable-cocoa) printf "%s" -Dcocoa=disabled ;;
--enable-colo-proxy) printf "%s" -Dcolo_proxy=enabled ;;
--disable-colo-proxy) printf "%s" -Dcolo_proxy=disabled ;;
+ --container-command=*) quote_sh "-Dcontainer_command=$2" ;;
+ --enable-containers) printf "%s" -Dcontainers=true ;;
+ --disable-containers) printf "%s" -Dcontainers=false ;;
--enable-coreaudio) printf "%s" -Dcoreaudio=enabled ;;
--disable-coreaudio) printf "%s" -Dcoreaudio=disabled ;;
--with-coroutine=*) quote_sh "-Dcoroutine_backend=$2" ;;
@@ -517,6 +611,50 @@ _meson_option_parse() {
--disable-tcg) printf "%s" -Dtcg=disabled ;;
--enable-tcg-interpreter) printf "%s" -Dtcg_interpreter=true ;;
--disable-tcg-interpreter) printf "%s" -Dtcg_interpreter=false ;;
+ --tcg-tests-cross-cc-aarch64=*) quote_sh "-Dtcg_tests_cross_cc_aarch64=$2" ;;
+ --tcg-tests-cross-cc-aarch64-be=*) quote_sh "-Dtcg_tests_cross_cc_aarch64_be=$2" ;;
+ --tcg-tests-cross-cc-alpha=*) quote_sh "-Dtcg_tests_cross_cc_alpha=$2" ;;
+ --tcg-tests-cross-cc-arm=*) quote_sh "-Dtcg_tests_cross_cc_arm=$2" ;;
+ --tcg-tests-cross-cc-hexagon=*) quote_sh "-Dtcg_tests_cross_cc_hexagon=$2" ;;
+ --tcg-tests-cross-cc-hppa=*) quote_sh "-Dtcg_tests_cross_cc_hppa=$2" ;;
+ --tcg-tests-cross-cc-i386=*) quote_sh "-Dtcg_tests_cross_cc_i386=$2" ;;
+ --tcg-tests-cross-cc-loongarch64=*) quote_sh "-Dtcg_tests_cross_cc_loongarch64=$2" ;;
+ --tcg-tests-cross-cc-m68k=*) quote_sh "-Dtcg_tests_cross_cc_m68k=$2" ;;
+ --tcg-tests-cross-cc-mips=*) quote_sh "-Dtcg_tests_cross_cc_mips=$2" ;;
+ --tcg-tests-cross-cc-mips64=*) quote_sh "-Dtcg_tests_cross_cc_mips64=$2" ;;
+ --tcg-tests-cross-cc-mips64el=*) quote_sh "-Dtcg_tests_cross_cc_mips64el=$2" ;;
+ --tcg-tests-cross-cc-or1k=*) quote_sh "-Dtcg_tests_cross_cc_or1k=$2" ;;
+ --tcg-tests-cross-cc-ppc64=*) quote_sh "-Dtcg_tests_cross_cc_ppc64=$2" ;;
+ --tcg-tests-cross-cc-ppc64le=*) quote_sh "-Dtcg_tests_cross_cc_ppc64le=$2" ;;
+ --tcg-tests-cross-cc-riscv64=*) quote_sh "-Dtcg_tests_cross_cc_riscv64=$2" ;;
+ --tcg-tests-cross-cc-s390x=*) quote_sh "-Dtcg_tests_cross_cc_s390x=$2" ;;
+ --tcg-tests-cross-cc-sh4=*) quote_sh "-Dtcg_tests_cross_cc_sh4=$2" ;;
+ --tcg-tests-cross-cc-tricore=*) quote_sh "-Dtcg_tests_cross_cc_tricore=$2" ;;
+ --tcg-tests-cross-cc-x86-64=*) quote_sh "-Dtcg_tests_cross_cc_x86_64=$2" ;;
+ --tcg-tests-cross-cc-xtensa=*) quote_sh "-Dtcg_tests_cross_cc_xtensa=$2" ;;
+ --tcg-tests-cross-cc-xtensaeb=*) quote_sh "-Dtcg_tests_cross_cc_xtensaeb=$2" ;;
+ --tcg-tests-cross-cflags-aarch64=*) quote_sh "-Dtcg_tests_cross_cflags_aarch64=$2" ;;
+ --tcg-tests-cross-cflags-aarch64-be=*) quote_sh "-Dtcg_tests_cross_cflags_aarch64_be=$2" ;;
+ --tcg-tests-cross-cflags-alpha=*) quote_sh "-Dtcg_tests_cross_cflags_alpha=$2" ;;
+ --tcg-tests-cross-cflags-arm=*) quote_sh "-Dtcg_tests_cross_cflags_arm=$2" ;;
+ --tcg-tests-cross-cflags-hexagon=*) quote_sh "-Dtcg_tests_cross_cflags_hexagon=$2" ;;
+ --tcg-tests-cross-cflags-hppa=*) quote_sh "-Dtcg_tests_cross_cflags_hppa=$2" ;;
+ --tcg-tests-cross-cflags-i386=*) quote_sh "-Dtcg_tests_cross_cflags_i386=$2" ;;
+ --tcg-tests-cross-cflags-loongarch64=*) quote_sh "-Dtcg_tests_cross_cflags_loongarch64=$2" ;;
+ --tcg-tests-cross-cflags-m68k=*) quote_sh "-Dtcg_tests_cross_cflags_m68k=$2" ;;
+ --tcg-tests-cross-cflags-mips=*) quote_sh "-Dtcg_tests_cross_cflags_mips=$2" ;;
+ --tcg-tests-cross-cflags-mips64=*) quote_sh "-Dtcg_tests_cross_cflags_mips64=$2" ;;
+ --tcg-tests-cross-cflags-mips64el=*) quote_sh "-Dtcg_tests_cross_cflags_mips64el=$2" ;;
+ --tcg-tests-cross-cflags-or1k=*) quote_sh "-Dtcg_tests_cross_cflags_or1k=$2" ;;
+ --tcg-tests-cross-cflags-ppc64=*) quote_sh "-Dtcg_tests_cross_cflags_ppc64=$2" ;;
+ --tcg-tests-cross-cflags-ppc64le=*) quote_sh "-Dtcg_tests_cross_cflags_ppc64le=$2" ;;
+ --tcg-tests-cross-cflags-riscv64=*) quote_sh "-Dtcg_tests_cross_cflags_riscv64=$2" ;;
+ --tcg-tests-cross-cflags-s390x=*) quote_sh "-Dtcg_tests_cross_cflags_s390x=$2" ;;
+ --tcg-tests-cross-cflags-sh4=*) quote_sh "-Dtcg_tests_cross_cflags_sh4=$2" ;;
+ --tcg-tests-cross-cflags-tricore=*) quote_sh "-Dtcg_tests_cross_cflags_tricore=$2" ;;
+ --tcg-tests-cross-cflags-x86-64=*) quote_sh "-Dtcg_tests_cross_cflags_x86_64=$2" ;;
+ --tcg-tests-cross-cflags-xtensa=*) quote_sh "-Dtcg_tests_cross_cflags_xtensa=$2" ;;
+ --tcg-tests-cross-cflags-xtensaeb=*) quote_sh "-Dtcg_tests_cross_cflags_xtensaeb=$2" ;;
--tls-priority=*) quote_sh "-Dtls_priority=$2" ;;
--enable-tools) printf "%s" -Dtools=enabled ;;
--disable-tools) printf "%s" -Dtools=disabled ;;
--
2.55.0
next reply other threads:[~2026-09-08 7:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-08 7:40 Daniel P. Berrangé [this message]
2026-09-08 7:52 ` [PATCH] meson: refresh build options script Marc-André Lureau
2026-09-10 22:14 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260908074016.2143292-1-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=pbonzini@redhat.com \
--cc=pierrick.bouvier@oss.qualcomm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.