[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/34] qga: wixl: get path to sysroot from pkg-config as intended
From: |
Paolo Bonzini |
Subject: |
[PATCH 03/34] qga: wixl: get path to sysroot from pkg-config as intended |
Date: |
Wed, 20 Apr 2022 17:33:36 +0200 |
The .wxs file uses $(var.Mingw_bin) while configure/meson have always
used Mingw_dlls. Fix them to match what was probably intended.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 4 ++--
qga/meson.build | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 2fc860ed9a..2bc5a0b84f 100755
--- a/configure
+++ b/configure
@@ -2702,7 +2702,7 @@ if test "$QEMU_GA_VERSION" = ""; then
QEMU_GA_VERSION=$(cat $source_path/VERSION)
fi
-QEMU_GA_MSI_MINGW_DLL_PATH="$($pkg_config --variable=prefix glib-2.0)/bin"
+QEMU_GA_MSI_MINGW_BIN_PATH="$($pkg_config --variable=prefix glib-2.0)/bin"
# Mac OS X ships with a broken assembler
roms=
@@ -2790,7 +2790,7 @@ if test "$debug_tcg" = "yes" ; then
fi
if test "$mingw32" = "yes" ; then
echo "CONFIG_WIN32=y" >> $config_host_mak
- echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >>
$config_host_mak
+ echo "QEMU_GA_MSI_MINGW_BIN_PATH=${QEMU_GA_MSI_MINGW_BIN_PATH}" >>
$config_host_mak
echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak
echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak
echo "QEMU_GA_VERSION=${QEMU_GA_VERSION}" >> $config_host_mak
diff --git a/qga/meson.build b/qga/meson.build
index 392d560941..6d9f39bb32 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -129,7 +129,7 @@ if targetos == 'windows'
wixl, '-o', '@OUTPUT0@', '@INPUT0@',
qemu_ga_msi_arch[cpu],
qemu_ga_msi_vss,
- '-D', 'Mingw_dlls=' +
config_host['QEMU_GA_MSI_MINGW_DLL_PATH'],
+ '-D', 'Mingw_bin=' +
config_host['QEMU_GA_MSI_MINGW_BIN_PATH'],
])
all_qga += [qga_msi]
alias_target('msi', qga_msi)
--
2.35.1
- [PATCH 00/34] Misc meson conversions for QEMU 7.1, Paolo Bonzini, 2022/04/20
- [PATCH 01/34] meson: show final set of compiler flags, Paolo Bonzini, 2022/04/20
- [PATCH 02/34] configure: remove dead code, Paolo Bonzini, 2022/04/20
- [PATCH 03/34] qga: wixl: get path to sysroot from pkg-config as intended,
Paolo Bonzini <=
- [PATCH 04/34] configure: pc-bios/qemu-icon.bmp does not exist, Paolo Bonzini, 2022/04/20
- [PATCH 05/34] configure: gcov should not exclude fortify-source, Paolo Bonzini, 2022/04/20
- [PATCH 16/34] configure, meson: move iasl detection to meson, Paolo Bonzini, 2022/04/20
- [PATCH 17/34] configure: move Windows flags detection to meson, Paolo Bonzini, 2022/04/20