meson: fix rule for qemu-ga installer

[PATCH] meson: fix rule for qemu-ga installer

Paolo Bonzini posted 1 patch 11 months, 2 weeks ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230522071906.59766-1-pbonzini@redhat.com

Maintainers: Michael Roth <michael.roth@amd.com>, Konstantin Kostiuk <kkostiuk@redhat.com>

qga/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] meson: fix rule for qemu-ga installer

Posted by Paolo Bonzini 11 months, 2 weeks ago

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

Re: [PATCH] meson: fix rule for qemu-ga installer

Posted by Marc-André Lureau 11 months, 2 weeks ago

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