[gnome-continuous-yocto/gnomeostree-3.28-rocko: 205/8267] gobject-introspection: Use SYSROOT_DIRS to add dirs to stage in sysroot

[Emmanuele Bassi <ebassi src gnome org>]

commit 4021e9bad64bf9e648dec75cee3b6ab95ed7066a
Author: Peter Kjellerstedt <peter kjellerstedt axis com>
Date:   Thu May 12 10:37:58 2016 +0200

    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>

 .../gobject-introspection_1.46.0.bb                |    9 ++++-----
 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 47102ca..861af5f 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|" \