diff options
| author | Ross Burton <ross.burton@arm.com> | 2021-03-26 15:56:26 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-05-08 21:30:03 +0300 |
| commit | 589236226856f591c9e8daf0cb7aa1aef8862388 (patch) | |
| tree | e87f62636d7b7b6cdaa5ffe3c6a49303b0bb3c53 | |
| parent | d5932a174d1504f1efea681e5ec3fd364de1ff6f (diff) | |
| download | meson-589236226856f591c9e8daf0cb7aa1aef8862388.zip meson-589236226856f591c9e8daf0cb7aa1aef8862388.tar.gz meson-589236226856f591c9e8daf0cb7aa1aef8862388.tar.bz2 | |
gnome: improve dependency lookup of G-I
Cross-compiling and generating gobject-introspection isn't trivial, but
with wrapper scripts that call qemu-user it's perfectly doable[1].
Currently looking up the gobject-introspection pkgconfig is done as a
native dependency, which means in cross-compilation environments this
is not the right paths (wrong library path, for example).
Solve this by generalisiing _get_native_dep() to _get_dep(native) and
asking for the host gobject-introspection instead.
[1] https://git.yoctoproject.org/cgit.cgi/poky/tree/meta/recipes-gnome/gobject-introspection/
| -rw-r--r-- | mesonbuild/modules/gnome.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index dc2979e..d0b053d 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -87,8 +87,8 @@ class GnomeModule(ExtensionModule): mlog.bold('https://github.com/mesonbuild/meson/issues/1387'), once=True) - def _get_native_dep(self, state, depname, required=True): - kwargs = {'native': True, 'required': required} + def _get_dep(self, state, depname, native=False, required=True): + kwargs = {'native': native, 'required': required} holder = self.interpreter.func_dependency(state.current_node, [depname], kwargs) return holder.held_object @@ -104,7 +104,7 @@ class GnomeModule(ExtensionModule): return ExternalProgram.from_entry(name, prog) # Check if pkgconfig has a variable - dep = self._get_native_dep(state, depname, required=False) + dep = self._get_dep(state, depname, native=True, required=False) if dep.found() and dep.type_name == 'pkgconfig': value = dep.get_pkgconfig_variable(varname, {}) if value: @@ -490,7 +490,7 @@ class GnomeModule(ExtensionModule): def _get_gir_dep(self, state): if not self.gir_dep: - self.gir_dep = self._get_native_dep(state, 'gobject-introspection-1.0') + self.gir_dep = self._get_dep(state, 'gobject-introspection-1.0') self.giscanner = self._get_native_binary(state, 'g-ir-scanner', 'gobject-introspection-1.0', 'g_ir_scanner') self.gicompiler = self._get_native_binary(state, 'g-ir-compiler', 'gobject-introspection-1.0', 'g_ir_compiler') return self.gir_dep, self.giscanner, self.gicompiler |