Reviewed-by: Konstantin Kostiuk <kkost...@redhat.com>
On Wed, Apr 20, 2022 at 6:37 PM Paolo Bonzini <pbonz...@redhat.com> wrote:
> 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 <pbonz...@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
>
>
>
>
