[oe-commits] [openembedded-core] 48/69: gobject-introspection: don't hardcode the directory names with system libraries

[git at git.openembedded.org]

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

commit 7db5ef4d66dc6096e4c8672b7d78f0fd43774cc8
Author: Alexander Kanavin <alexander.kanavin at linux.intel.com>
AuthorDate: Mon Mar 7 17:19:58 2016 +0200

    gobject-introspection: don't hardcode the directory names with system libraries
    
    Especially when using multilib they can be something else than '/lib' and '/usr/lib'.
    
    Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb | 2 +-
 1 file changed, 1 insertion(+), 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 f06dd5b..37a5f3e 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
@@ -48,7 +48,7 @@ do_configure_prepend_class-native() {
 do_configure_prepend_class-target() {
         # Write out a qemu wrapper that will be given to gi-scanner so that it
         # can run target helper binaries through that.
-        qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/lib','$STAGING_DIR_HOST/usr/lib'])}"
+        qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}"
         cat > ${B}/g-ir-scanner-qemuwrapper << EOF
 #!/bin/sh
 $qemu_binary "\$@"

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