diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch b/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch new file mode 100644 index 0000000000..ded42d14f7 --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 972667e0d789a6969a5d79249404f3539f891810 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 4 Aug 2017 16:18:47 +0300 | ||
4 | Subject: [PATCH 1/2] gobject-introspection: determine g-ir-scanner and | ||
5 | g-ir-compiler paths from pkgconfig | ||
6 | |||
7 | Do not hardcode the name of those binaries; gobject-introspection | ||
8 | provides them via pkgconfig, and they can be set to something else | ||
9 | (for example when cross-compiling). | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | |||
14 | --- | ||
15 | mesonbuild/modules/gnome.py | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py | ||
19 | index 4f7fe30..9610cf6 100644 | ||
20 | --- a/mesonbuild/modules/gnome.py | ||
21 | +++ b/mesonbuild/modules/gnome.py | ||
22 | @@ -390,8 +390,6 @@ class GnomeModule(ExtensionModule): | ||
23 | raise MesonException('Gir takes one argument') | ||
24 | if kwargs.get('install_dir'): | ||
25 | raise MesonException('install_dir is not supported with generate_gir(), see "install_dir_gir" and "install_dir_typelib"') | ||
26 | - giscanner = find_program('g-ir-scanner', 'Gir') | ||
27 | - gicompiler = find_program('g-ir-compiler', 'Gir') | ||
28 | girtarget = args[0] | ||
29 | while hasattr(girtarget, 'held_object'): | ||
30 | girtarget = girtarget.held_object | ||
31 | @@ -402,6 +400,8 @@ class GnomeModule(ExtensionModule): | ||
32 | self.gir_dep = PkgConfigDependency('gobject-introspection-1.0', | ||
33 | state.environment, | ||
34 | {'native': True}) | ||
35 | + giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) | ||
36 | + gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) | ||
37 | pkgargs = self.gir_dep.get_compile_args() | ||
38 | except Exception: | ||
39 | raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.') | ||
40 | -- | ||
41 | 2.15.0 | ||
42 | |||