Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 1 | When building gobject-introspection we want the *native* binaries (as they need |
| 2 | to be executed) but *host* gobject-introspection libraries, as otherwise the |
| 3 | native pkg-config can be used and the build will try to link native and host |
| 4 | binaries together. |
| 5 | |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 6 | Upstream-Status: Backport [589236226856f591c9e8daf0cb7aa1aef8862388] |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 7 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
| 8 | |
| 9 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py |
| 10 | index f9660838e..2eefc3fc7 100644 |
| 11 | --- a/mesonbuild/modules/gnome.py |
| 12 | +++ b/mesonbuild/modules/gnome.py |
| 13 | @@ -84,8 +84,8 @@ class GnomeModule(ExtensionModule): |
| 14 | mlog.bold('https://github.com/mesonbuild/meson/issues/1387'), |
| 15 | once=True) |
| 16 | |
| 17 | - def _get_native_dep(self, state, depname, required=True): |
| 18 | - kwargs = {'native': True, 'required': required} |
| 19 | + def _get_dep(self, state, depname, native=False, required=True): |
| 20 | + kwargs = {'native': native, 'required': required} |
| 21 | holder = self.interpreter.func_dependency(state.current_node, [depname], kwargs) |
| 22 | return holder.held_object |
| 23 | |
| 24 | @@ -101,7 +101,7 @@ class GnomeModule(ExtensionModule): |
| 25 | return ExternalProgram.from_entry(name, prog) |
| 26 | |
| 27 | # Check if pkgconfig has a variable |
| 28 | - dep = self._get_native_dep(state, depname, required=False) |
| 29 | + dep = self._get_dep(state, depname, native=True, required=False) |
| 30 | if dep.found() and dep.type_name == 'pkgconfig': |
| 31 | value = dep.get_pkgconfig_variable(varname, {}) |
| 32 | if value: |
| 33 | @@ -481,7 +481,7 @@ class GnomeModule(ExtensionModule): |
| 34 | |
| 35 | def _get_gir_dep(self, state): |
| 36 | if not self.gir_dep: |
| 37 | - self.gir_dep = self._get_native_dep(state, 'gobject-introspection-1.0') |
| 38 | + self.gir_dep = self._get_dep(state, 'gobject-introspection-1.0') |
| 39 | self.giscanner = self._get_native_binary(state, 'g-ir-scanner', 'gobject-introspection-1.0', 'g_ir_scanner') |
| 40 | self.gicompiler = self._get_native_binary(state, 'g-ir-compiler', 'gobject-introspection-1.0', 'g_ir_compiler') |
| 41 | return self.gir_dep, self.giscanner, self.gicompiler |