[oe-commits] [openembedded-core] 31/72: gobject-introspection: Handle sstate relocation of scripts correctly

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 65a525a9c51f5730638ba48236ad5db0d13c4aa2
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Mar 2 10:10:06 2016 +0000

    gobject-introspection: Handle sstate relocation of scripts correctly
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../gobject-introspection/gobject-introspection_1.46.0.bb             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 d346dca..3b6dda8 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
@@ -36,6 +36,8 @@ DEPENDS_append = " libffi zlib glib-2.0"
 # native versions of its own tools during build.
 DEPENDS_class-target_append = " gobject-introspection-native qemu-native"
 
+SSTATE_SCAN_FILES += "g-ir-scanner-qemuwrapper g-ir-scanner-wrapper g-ir-compiler-wrapper g-ir-scanner-lddwrapper Gio-2.0.gir"
+
 do_configure_prepend_class-native() {
         # Tweak the native python scripts so that they don't refer to the
         # full path of native python binary (the solution is taken from glib-2.0 recipe)
@@ -67,7 +69,7 @@ EOF
 # This prevents g-ir-scanner from writing cache data to $HOME
 export GI_SCANNER_DISABLE_CACHE=1
 
-${STAGING_BINDIR_NATIVE}/g-ir-scanner --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 "\$@"
+g-ir-scanner --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 "\$@"
 EOF
         chmod +x ${B}/g-ir-scanner-wrapper
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.