summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2016-05-12 10:37:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:41:28 +0100
commit4021e9bad64bf9e648dec75cee3b6ab95ed7066a (patch)
tree15f0f2040f1eddb6b229faa470d38b644777cf08 /meta/recipes-gnome
parentdf0299431bb047e9357c62cc6d446ee145906d29 (diff)
downloadopenembedded-core-contrib-4021e9bad64bf9e648dec75cee3b6ab95ed7066a.tar.gz
openembedded-core-contrib-4021e9bad64bf9e648dec75cee3b6ab95ed7066a.tar.bz2
openembedded-core-contrib-4021e9bad64bf9e648dec75cee3b6ab95ed7066a.zip
gobject-introspection: Use SYSROOT_DIRS to add dirs to stage in sysroot
(From OE-Core rev: e843e7d6cb01fe2f4f9d7c7a881e87ceaed2b794) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb
index 47102cac6f..861af5f20f 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb
@@ -151,13 +151,12 @@ FILES_${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a"
# we need target versions of introspection tools in sysroot so that they can be run via qemu
# when building introspection files in other packages
-SYSROOT_PREPROCESS_FUNCS_append_class-target += "gi_binaries_sysroot_preprocess"
+SYSROOT_DIRS_append_class-target = " ${bindir}"
+SYSROOT_PREPROCESS_FUNCS_append_class-target = " gi_binaries_sysroot_preprocess"
gi_binaries_sysroot_preprocess() {
- sysroot_stage_dir ${D}${bindir} ${SYSROOT_DESTDIR}${bindir}
-
- # Also, tweak the binary names in introspection pkgconfig file, so that it picks up our
- # wrappers which do the cross-compile and qemu magic.
+ # Tweak the binary names in the introspection pkgconfig file, so that it
+ # picks up our wrappers which do the cross-compile and qemu magic.
sed -i \
-e "s|g_ir_scanner=.*|g_ir_scanner=${bindir}/g-ir-scanner-wrapper|" \
-e "s|g_ir_compiler=.*|g_ir_compiler=${bindir}/g-ir-compiler-wrapper|" \