From: Markus Armbruster <armbru@redhat.com>
Date: Mon, 6 Feb 2023 10:20:37 +0000 (+0100)
Subject: meson: Avoid duplicates in generated config-poison.h again
X-Git-Tag: v8.0.0-rc0~42^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1248a15965b77f9b9b5d6efcd9138ae299fbc8c2;p=thirdparty%2Fqemu.git

meson: Avoid duplicates in generated config-poison.h again

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 <armbru@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230206102037.3621709-1-armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh
index d222a043043..18928542614 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