From 1248a15965b77f9b9b5d6efcd9138ae299fbc8c2 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 6 Feb 2023 11:20:37 +0100 Subject: meson: Avoid duplicates in generated config-poison.h again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit eed56e9a89f "configure, meson: move config-poison.h to meson" lost a "| sort -u". Restore it. config-poison shrinks from ~4500 to ~700 lines when all targets are enabled. Signed-off-by: Markus Armbruster Reviewed-by: Alex Bennée Reviewed-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé Tested-by: Alex Bennée Message-Id: <20230206102037.3621709-1-armbru@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/make-config-poison.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh index d222a04..1892854 100755 --- a/scripts/make-config-poison.sh +++ b/scripts/make-config-poison.sh @@ -13,4 +13,4 @@ exec sed -n \ -e 's///' \ -e 's/ .*//' \ -e 's/^/#pragma GCC poison /p' \ - -e '}' "$@" + -e '}' "$@" | sort -u -- cgit v1.1 From 1b1be8d3cc57a6ad86c3a54fb2750adfae707ae3 Mon Sep 17 00:00:00 2001 From: John Snow Date: Mon, 20 Feb 2023 20:24:55 -0500 Subject: meson: stop looking for 'sphinx-build-3' Once upon a time, "sphinx-build" on certain RPM platforms invoked specifically a Python 2.x version, while "sphinx-build-3" was a distro shim for the Python 3.x version. These days, none of our supported platforms utilize a 2.x version, and those that still have 'sphinx-build-3' make it a symbolic link to 'sphinx-build'. Not searching for 'sphinx-build-3' will prefer pip/venv installed versions of sphinx if they're available. This adds an extremely convenient ability to test document building ability in QEMU across multiple versions of Sphinx for the purposes of compatibility testing. Signed-off-by: John Snow Message-Id: <20230221012456.2607692-6-jsnow@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/meson-buildoptions.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 5d969a9..009fab1 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -55,6 +55,7 @@ meson_options_help() { printf "%s\n" ' --localstatedir=VALUE Localstate data directory [/var/local]' printf "%s\n" ' --mandir=VALUE Manual page directory [share/man]' printf "%s\n" ' --sphinx-build=VALUE Use specified sphinx-build for building document' + printf "%s\n" ' [sphinx-build]' printf "%s\n" ' --sysconfdir=VALUE Sysconf data directory [etc]' printf "%s\n" ' --tls-priority=VALUE Default TLS protocol/cipher priority string' printf "%s\n" ' [NORMAL]' -- cgit v1.1