From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 7 May 2024 10:48:22 +0000 (+0200)
Subject: configure: quote -D options that are passed through to meson
X-Git-Tag: v8.2.5~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19a931f207587d44d0beabd94c9f282c67baea4b;p=thirdparty%2Fqemu.git

configure: quote -D options that are passed through to meson

Ensure that they go through unmodified, instead of removing one layer
of quoting.

-D is a pretty specialized option and most options that can have spaces
do not need it (for example, c_args is covered by --extra-cflags).
Therefore it's unlikely that this causes actual trouble.  However,
a somewhat realistic failure case would be with -Dpkg_config_path
and a pkg-config directory that contains spaces.

Cc: qemu-stable@nongnu.org
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 23b1f53c2c8990ed745acede171e49645af3d6d0)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/configure b/configure
index 163729c3ec9..66ca736621f 100755
--- a/configure
+++ b/configure
@@ -761,7 +761,7 @@ for opt do
   --*) meson_option_parse "$opt" "$optarg"
   ;;
   # Pass through -Dxxxx options to meson
-  -D*) meson_options="$meson_options $opt"
+  -D*) meson_option_add "$opt"
   ;;
   esac
 done