* [PATCH for-5.2] meson: Fix build with --disable-guest-agent-msi
@ 2020-11-17 20:18 Stefan Weil
2020-11-18 8:30 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Weil @ 2020-11-17 20:18 UTC (permalink / raw)
To: qemu-devel, Paolo Bonzini, Michael Roth; +Cc: Stefan Weil
The QGA MSI target requires several macros which are only available
without --disable-guest-agent-msi.
Don't define that target if configure was called with --disable-guest-agent-msi.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
qga/meson.build | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/qga/meson.build b/qga/meson.build
index 53ba6de5f8..520af6ce9b 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -61,23 +61,25 @@ if targetos == 'windows'
if 'CONFIG_QGA_VSS' in config_host and 'QEMU_GA_MSI_WITH_VSS' in config_host
deps += qga_vss
endif
- qga_msi = custom_target('QGA MSI',
- input: files('installer/qemu-ga.wxs'),
- output: 'qemu-ga-@0@.msi'.format(config_host['ARCH']),
- depends: deps,
- command: [
- find_program('env'),
- 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'],
- 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'],
- 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'],
- 'BUILD_DIR=' + meson.build_root(),
- wixl, '-o', '@OUTPUT0@', '@INPUT0@',
- config_host['QEMU_GA_MSI_ARCH'].split(),
- config_host['QEMU_GA_MSI_WITH_VSS'].split(),
- config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
- ])
- all_qga += [qga_msi]
- alias_target('msi', qga_msi)
+ if 'CONFIG_QGA_MSI' in config_host
+ qga_msi = custom_target('QGA MSI',
+ input: files('installer/qemu-ga.wxs'),
+ output: 'qemu-ga-@0@.msi'.format(config_host['ARCH']),
+ depends: deps,
+ command: [
+ find_program('env'),
+ 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'],
+ 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'],
+ 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'],
+ 'BUILD_DIR=' + meson.build_root(),
+ wixl, '-o', '@OUTPUT0@', '@INPUT0@',
+ config_host['QEMU_GA_MSI_ARCH'].split(),
+ config_host['QEMU_GA_MSI_WITH_VSS'].split(),
+ config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
+ ])
+ all_qga += [qga_msi]
+ alias_target('msi', qga_msi)
+ endif
endif
else
install_subdir('run', install_dir: get_option('localstatedir'))
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH for-5.2] meson: Fix build with --disable-guest-agent-msi
2020-11-17 20:18 [PATCH for-5.2] meson: Fix build with --disable-guest-agent-msi Stefan Weil
@ 2020-11-18 8:30 ` Paolo Bonzini
2020-11-18 11:16 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 3+ messages in thread
From: Paolo Bonzini @ 2020-11-18 8:30 UTC (permalink / raw)
To: Stefan Weil, qemu-devel, Michael Roth
On 17/11/20 21:18, Stefan Weil wrote:
> The QGA MSI target requires several macros which are only available
> without --disable-guest-agent-msi.
>
> Don't define that target if configure was called with --disable-guest-agent-msi.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> qga/meson.build | 36 +++++++++++++++++++-----------------
> 1 file changed, 19 insertions(+), 17 deletions(-)
>
> diff --git a/qga/meson.build b/qga/meson.build
> index 53ba6de5f8..520af6ce9b 100644
> --- a/qga/meson.build
> +++ b/qga/meson.build
> @@ -61,23 +61,25 @@ if targetos == 'windows'
> if 'CONFIG_QGA_VSS' in config_host and 'QEMU_GA_MSI_WITH_VSS' in config_host
> deps += qga_vss
> endif
> - qga_msi = custom_target('QGA MSI',
> - input: files('installer/qemu-ga.wxs'),
> - output: 'qemu-ga-@0@.msi'.format(config_host['ARCH']),
> - depends: deps,
> - command: [
> - find_program('env'),
> - 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'],
> - 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'],
> - 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'],
> - 'BUILD_DIR=' + meson.build_root(),
> - wixl, '-o', '@OUTPUT0@', '@INPUT0@',
> - config_host['QEMU_GA_MSI_ARCH'].split(),
> - config_host['QEMU_GA_MSI_WITH_VSS'].split(),
> - config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
> - ])
> - all_qga += [qga_msi]
> - alias_target('msi', qga_msi)
> + if 'CONFIG_QGA_MSI' in config_host
> + qga_msi = custom_target('QGA MSI',
> + input: files('installer/qemu-ga.wxs'),
> + output: 'qemu-ga-@0@.msi'.format(config_host['ARCH']),
> + depends: deps,
> + command: [
> + find_program('env'),
> + 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'],
> + 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'],
> + 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'],
> + 'BUILD_DIR=' + meson.build_root(),
> + wixl, '-o', '@OUTPUT0@', '@INPUT0@',
> + config_host['QEMU_GA_MSI_ARCH'].split(),
> + config_host['QEMU_GA_MSI_WITH_VSS'].split(),
> + config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
> + ])
> + all_qga += [qga_msi]
> + alias_target('msi', qga_msi)
> + endif
> endif
> else
> install_subdir('run', install_dir: get_option('localstatedir'))
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH for-5.2] meson: Fix build with --disable-guest-agent-msi
2020-11-18 8:30 ` Paolo Bonzini
@ 2020-11-18 11:16 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-18 11:16 UTC (permalink / raw)
To: Paolo Bonzini, Stefan Weil, qemu-devel, Michael Roth
On 11/18/20 9:30 AM, Paolo Bonzini wrote:
> On 17/11/20 21:18, Stefan Weil wrote:
>> The QGA MSI target requires several macros which are only available
>> without --disable-guest-agent-msi.
>>
>> Don't define that target if configure was called with
>> --disable-guest-agent-msi.
Can we have a CI job to avoid further regressions?
>>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>> ---
>> qga/meson.build | 36 +++++++++++++++++++-----------------
>> 1 file changed, 19 insertions(+), 17 deletions(-)
>>
>> diff --git a/qga/meson.build b/qga/meson.build
>> index 53ba6de5f8..520af6ce9b 100644
>> --- a/qga/meson.build
>> +++ b/qga/meson.build
>> @@ -61,23 +61,25 @@ if targetos == 'windows'
>> if 'CONFIG_QGA_VSS' in config_host and 'QEMU_GA_MSI_WITH_VSS' in
>> config_host
>> deps += qga_vss
>> endif
>> - qga_msi = custom_target('QGA MSI',
>> - input: files('installer/qemu-ga.wxs'),
>> - output:
>> 'qemu-ga-@0@.msi'.format(config_host['ARCH']),
>> - depends: deps,
>> - command: [
>> - find_program('env'),
>> - 'QEMU_GA_VERSION=' +
>> config_host['QEMU_GA_VERSION'],
>> - 'QEMU_GA_MANUFACTURER=' +
>> config_host['QEMU_GA_MANUFACTURER'],
>> - 'QEMU_GA_DISTRO=' +
>> config_host['QEMU_GA_DISTRO'],
>> - 'BUILD_DIR=' + meson.build_root(),
>> - wixl, '-o', '@OUTPUT0@', '@INPUT0@',
>> - config_host['QEMU_GA_MSI_ARCH'].split(),
>> -
>> config_host['QEMU_GA_MSI_WITH_VSS'].split(),
>> -
>> config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
>> - ])
>> - all_qga += [qga_msi]
>> - alias_target('msi', qga_msi)
>> + if 'CONFIG_QGA_MSI' in config_host
>> + qga_msi = custom_target('QGA MSI',
>> + input: files('installer/qemu-ga.wxs'),
>> + output:
>> 'qemu-ga-@0@.msi'.format(config_host['ARCH']),
>> + depends: deps,
>> + command: [
>> + find_program('env'),
>> + 'QEMU_GA_VERSION=' +
>> config_host['QEMU_GA_VERSION'],
>> + 'QEMU_GA_MANUFACTURER=' +
>> config_host['QEMU_GA_MANUFACTURER'],
>> + 'QEMU_GA_DISTRO=' +
>> config_host['QEMU_GA_DISTRO'],
>> + 'BUILD_DIR=' + meson.build_root(),
>> + wixl, '-o', '@OUTPUT0@', '@INPUT0@',
>> + config_host['QEMU_GA_MSI_ARCH'].split(),
>> +
>> config_host['QEMU_GA_MSI_WITH_VSS'].split(),
>> +
>> config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
>> + ])
>> + all_qga += [qga_msi]
>> + alias_target('msi', qga_msi)
>> + endif
>> endif
>> else
>> install_subdir('run', install_dir: get_option('localstatedir'))
>>
>
> Queued, thanks.
>
> Paolo
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-18 11:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-17 20:18 [PATCH for-5.2] meson: Fix build with --disable-guest-agent-msi Stefan Weil
2020-11-18 8:30 ` Paolo Bonzini
2020-11-18 11:16 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).