[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/34] qga: wixl: get path to sysroot from pkg-config as inten
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 03/34] qga: wixl: get path to sysroot from pkg-config as intended |
Date: |
Sat, 23 Apr 2022 14:51:20 +0200 |
The .wxs file uses $(var.Mingw_bin) while configure/meson have always
used Mingw_dlls. Fix them to match what was probably intended.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
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 9e32c96fce..049f669a94 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 v2 00/34] Misc meson conversions for QEMU 7.1, Paolo Bonzini, 2022/04/23
- [PATCH v2 01/34] meson: show final set of compiler flags, Paolo Bonzini, 2022/04/23
- [PATCH v2 02/34] configure: remove dead code, Paolo Bonzini, 2022/04/23
- [PATCH v2 04/34] configure: pc-bios/qemu-icon.bmp does not exist, Paolo Bonzini, 2022/04/23
- [PATCH v2 03/34] qga: wixl: get path to sysroot from pkg-config as intended,
Paolo Bonzini <=
- [PATCH v2 05/34] configure: gcov should not exclude fortify-source, Paolo Bonzini, 2022/04/23
- [PATCH v2 06/34] configure: move --enable/--disable-debug-info to second option parsing pass, Paolo Bonzini, 2022/04/23
- [PATCH v2 07/34] configure, meson: move OpenGL check to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 08/34] meson, configure: move RDMA options to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 09/34] meson, configure: move keyctl test to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 10/34] meson, configure: move usbfs test to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 11/34] meson, configure: move libgio test to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 13/34] meson, configure: move --enable-module-upgrades to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 12/34] meson: remove CONFIG_XEN_PCI_PASSTHROUGH from config-target.h, Paolo Bonzini, 2022/04/23
- [PATCH v2 15/34] meson-buildoptions: add support for string options, Paolo Bonzini, 2022/04/23