From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Tue, 8 Oct 2024 12:50:22 +0000 (+0400)
Subject: meson: find_program('gdbus-codegen') directly
X-Git-Tag: v9.2.0-rc0~49^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c118c8eb3e63c02421e8a02e82ffab6fa8369301;p=thirdparty%2Fqemu.git

meson: find_program('gdbus-codegen') directly

gio.pc variable is a bit bogus in context of cross-compilation, since it
contains an absolute path, relative to the sysroot directory. On Fedora, it ends
up as:
/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig/usr/bin/gdbus-codegen
path which does not exist because it is not shipped by Fedora mingw
packages.

Instead, we can rely on meson find_program() behaviour to do a better
job based on its search order and capabilities.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-ID: <20241008125028.1177932-14-marcandre.lureau@redhat.com>
---

diff --git a/meson.build b/meson.build
index aecc381932d..ed0d2086cb8 100644
--- a/meson.build
+++ b/meson.build
@@ -1036,7 +1036,7 @@ if not get_option('gio').auto() or have_system
     gio = not_found
   endif
   if gio.found()
-    gdbus_codegen = find_program(gio.get_variable('gdbus_codegen'),
+    gdbus_codegen = find_program('gdbus-codegen',
                                  required: get_option('gio'))
     gio_unix = dependency('gio-unix-2.0', required: get_option('gio'),
                           method: 'pkg-config')