aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2023-01-07 14:32:41 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2023-01-11 09:59:38 +0100
commitacedc9a660f83b362a1dec4b699e85d5dd82a067 (patch)
treecfc1a9c188e82856b8c50eb0f2f601c2dfa7d189
parentaa96ab7c9df59c615ca82b49c9062819e0a1c287 (diff)
downloadqemu-acedc9a660f83b362a1dec4b699e85d5dd82a067.zip
qemu-acedc9a660f83b362a1dec4b699e85d5dd82a067.tar.gz
qemu-acedc9a660f83b362a1dec4b699e85d5dd82a067.tar.bz2
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: Валентин <val15032008@mail.ru> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1414 Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 2281892..6f5e77a 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