* [PATCH] meson: fix rule for qemu-ga installer
@ 2023-05-22 7:19 Paolo Bonzini
2023-05-22 13:43 ` Marc-André Lureau
0 siblings, 1 reply; 2+ messages in thread
From: Paolo Bonzini @ 2023-05-22 7:19 UTC (permalink / raw)
To: qemu-devel
The bindir variable is not available in the "glib" variable, which is an internal
dependency (created with "declare_dependency"). Use glib_pc instead, which contains
the variable as it is instantiated from glib-2.0.pc.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qga/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qga/meson.build b/qga/meson.build
index 622b5f94a232..d3291b4376cb 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -154,7 +154,7 @@ if targetos == 'windows'
qemu_ga_msi_arch[cpu],
qemu_ga_msi_vss,
'-D', 'BUILD_DIR=' + meson.project_build_root(),
- '-D', 'BIN_DIR=' + glib.get_variable('bindir'),
+ '-D', 'BIN_DIR=' + glib_pc.get_variable('bindir'),
'-D', 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'],
'-D', 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'],
'-D', 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'],
--
2.40.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] meson: fix rule for qemu-ga installer
2023-05-22 7:19 [PATCH] meson: fix rule for qemu-ga installer Paolo Bonzini
@ 2023-05-22 13:43 ` Marc-André Lureau
0 siblings, 0 replies; 2+ messages in thread
From: Marc-André Lureau @ 2023-05-22 13:43 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]
On Mon, May 22, 2023 at 11:20 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
> The bindir variable is not available in the "glib" variable, which is an
> internal
> dependency (created with "declare_dependency"). Use glib_pc instead,
> which contains
> the variable as it is instantiated from glib-2.0.pc.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> qga/meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/qga/meson.build b/qga/meson.build
> index 622b5f94a232..d3291b4376cb 100644
> --- a/qga/meson.build
> +++ b/qga/meson.build
> @@ -154,7 +154,7 @@ if targetos == 'windows'
> qemu_ga_msi_arch[cpu],
> qemu_ga_msi_vss,
> '-D', 'BUILD_DIR=' +
> meson.project_build_root(),
> - '-D', 'BIN_DIR=' +
> glib.get_variable('bindir'),
> + '-D', 'BIN_DIR=' +
> glib_pc.get_variable('bindir'),
> '-D', 'QEMU_GA_VERSION=' +
> config_host['QEMU_GA_VERSION'],
> '-D', 'QEMU_GA_MANUFACTURER=' +
> config_host['QEMU_GA_MANUFACTURER'],
> '-D', 'QEMU_GA_DISTRO=' +
> config_host['QEMU_GA_DISTRO'],
> --
> 2.40.1
>
>
>
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 2448 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-22 13:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-22 7:19 [PATCH] meson: fix rule for qemu-ga installer Paolo Bonzini
2023-05-22 13:43 ` Marc-André Lureau
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).