diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-05-04 15:32:42 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-08 10:20:27 +0100 |
| commit | dbac12d5eacc945881d472dca492180b62e6f345 (patch) | |
| tree | 1666ac4498e35cbabd55180982c199c92e50130e /meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch | |
| parent | 9be9db5fa6f373f16fbe8638d3f7630a24dafcfb (diff) | |
| download | openembedded-core-contrib-dbac12d5eacc945881d472dca492180b62e6f345.tar.gz | |
meson: update to 0.46.0
Rebase a couple of patches
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 17 |
1 files changed, 7 insertions, 10 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 index ded42d14f7..f32267d0c4 100644 --- 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 @@ -1,7 +1,7 @@ -From 972667e0d789a6969a5d79249404f3539f891810 Mon Sep 17 00:00:00 2001 +From 0b860cb8a22ae876b6088939dbabca216bc29431 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 4 Aug 2017 16:18:47 +0300 -Subject: [PATCH 1/2] gobject-introspection: determine g-ir-scanner and +Subject: [PATCH] gobject-introspection: determine g-ir-scanner and g-ir-compiler paths from pkgconfig Do not hardcode the name of those binaries; gobject-introspection @@ -16,19 +16,19 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 4f7fe30..9610cf6 100644 +index b29bab9..dc4c401 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py -@@ -390,8 +390,6 @@ class GnomeModule(ExtensionModule): +@@ -393,8 +393,6 @@ class GnomeModule(ExtensionModule): raise MesonException('Gir takes one argument') if kwargs.get('install_dir'): raise MesonException('install_dir is not supported with generate_gir(), see "install_dir_gir" and "install_dir_typelib"') -- giscanner = find_program('g-ir-scanner', 'Gir') -- gicompiler = find_program('g-ir-compiler', 'Gir') +- giscanner = self.interpreter.find_program_impl('g-ir-scanner') +- gicompiler = self.interpreter.find_program_impl('g-ir-compiler') girtarget = args[0] while hasattr(girtarget, 'held_object'): girtarget = girtarget.held_object -@@ -402,6 +400,8 @@ class GnomeModule(ExtensionModule): +@@ -405,6 +403,8 @@ class GnomeModule(ExtensionModule): self.gir_dep = PkgConfigDependency('gobject-introspection-1.0', state.environment, {'native': True}) @@ -37,6 +37,3 @@ index 4f7fe30..9610cf6 100644 pkgargs = self.gir_dep.get_compile_args() except Exception: raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.') --- -2.15.0 - |