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

Markus Armbruster posted 1 patch 1 year, 2 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230206102037.3621709-1-armbru@redhat.com
scripts/make-config-poison.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] meson: Avoid duplicates in generated config-poison.h again
Posted by Markus Armbruster 1 year, 2 months ago
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>
---
 scripts/make-config-poison.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh
index d222a04304..1892854261 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
-- 
2.39.0
Re: [PATCH] meson: Avoid duplicates in generated config-poison.h again
Posted by Paolo Bonzini 1 year, 2 months ago
Queued, thanks.

Paolo
Re: [PATCH] meson: Avoid duplicates in generated config-poison.h again
Posted by Markus Armbruster 1 year, 2 months ago
Nominating for qemu-trivial.  Thanks in advance!
Re: [PATCH] meson: Avoid duplicates in generated config-poison.h again
Posted by Alex Bennée 1 year, 2 months ago
Markus Armbruster <armbru@redhat.com> writes:

> 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>
Tested-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro
Re: [PATCH] meson: Avoid duplicates in generated config-poison.h again
Posted by Philippe Mathieu-Daudé 1 year, 2 months ago
On 6/2/23 11:20, Markus Armbruster wrote:
> 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>
> ---
>   scripts/make-config-poison.sh | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>



Re: [PATCH] meson: Avoid duplicates in generated config-poison.h again
Posted by Marc-André Lureau 1 year, 2 months ago
On Mon, Feb 6, 2023 at 2:21 PM Markus Armbruster <armbru@redhat.com> wrote:
>
> 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: Marc-André Lureau <marcandre.lureau@redhat.com>

> ---
>  scripts/make-config-poison.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh
> index d222a04304..1892854261 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
> --
> 2.39.0
>
>


-- 
Marc-André Lureau