[OE-core] [PATCH 08/27] meson: remove PKG_CONFIG_SYSROOT_DIR work-around
Maxin B. John
maxin.john at intel.com
Mon Feb 19 08:36:59 UTC 2018
We are moving from freedesktop.org's pkg-config to pkgconf.
This helps us to update the following patch as PKG_CONFIG_SYSROOT_DIR
behaves consistently with pkgconf:
1) 0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
Signed-off-by: Maxin B. John <maxin.john at intel.com>
---
.../0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch | 4 ++--
1 file changed, 2 insertions(+), 2 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 ded42d1..440f637 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
@@ -32,8 +32,8 @@ index 4f7fe30..9610cf6 100644
self.gir_dep = PkgConfigDependency('gobject-introspection-1.0',
state.environment,
{'native': True})
-+ giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
-+ gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
++ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
++ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
pkgargs = self.gir_dep.get_compile_args()
except Exception:
raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.')
--
2.4.0
More information about the Openembedded-core
mailing list