From: Paolo Bonzini Date: Sat, 7 Jan 2023 13:32:41 +0000 (+0100) Subject: configure: fix GLIB_VERSION for cross-compilation X-Git-Tag: v8.0.0-rc0~98^2~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acedc9a660f83b362a1dec4b699e85d5dd82a067;p=thirdparty%2Fqemu.git configure: fix GLIB_VERSION for cross-compilation configure uses "pkg-config" directly so that GLIB_VERSION is always based on host glib version. To correctly handle cross-compilation it should use "$pkg_config" and take GLIB_VERSION from the cross-compiled glib. Reported-by: Валентин Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1414 Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- diff --git a/configure b/configure index 22818926576..6f5e77a7136 100755 --- a/configure +++ b/configure @@ -2375,7 +2375,7 @@ echo "QEMU_OBJCFLAGS=$QEMU_OBJCFLAGS" >> $config_host_mak echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak echo "GLIB_LIBS=$glib_libs" >> $config_host_mak echo "GLIB_BINDIR=$glib_bindir" >> $config_host_mak -echo "GLIB_VERSION=$(pkg-config --modversion glib-2.0)" >> $config_host_mak +echo "GLIB_VERSION=$($pkg_config --modversion glib-2.0)" >> $config_host_mak echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak