gtk-icon-cache: pass the native libdir to the intercept

The intercept runs against the native sysroot so we need to pass it
the native libdir instead of the target libdir, as otherwise it will
use target paths (such as lib64) in the native sysroot.

(From OE-Core rev: 0fe84007176c98644b1917966c98501beb7e0ce2)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 425397af3a99efb265e10b9915d3db0474e9c134..0f1052b08c77abc62027b61f2202b1d4fdad82df 100644 (file)
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -6,7 +6,7 @@ gtk_icon_cache_postinst() {
 if [ "x$D" != "x" ]; then
        $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \
                mlprefix=${MLPREFIX} \
-               libdir=${libdir}
+               libdir_native=${libdir_native}
 else
 
        # Update the pixbuf loaders in case they haven't been registered yet

diff --git a/scripts/postinst-intercepts/update_icon_cache b/scripts/postinst-intercepts/update_icon_cache
index df9bdecc99e5d25acab76a487fe83f94948b82d5..9cf2a72a0cf55b943f2b76cbb6594da76c534c62 100644 (file)
--- a/scripts/postinst-intercepts/update_icon_cache
+++ b/scripts/postinst-intercepts/update_icon_cache
@@ -3,7 +3,7 @@
 set -e
 
 # update native pixbuf loaders
-$STAGING_DIR_NATIVE/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
+$STAGING_DIR_NATIVE/${libdir_native}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
 
 for icondir in $D/usr/share/icons/*/ ; do
     if [ -d $icondir ] ; then