Bladeren bron

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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Ross Burton 8 jaren geleden
bovenliggende
commit
0fe8400717
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      meta/classes/gtk-icon-cache.bbclass
  2. 1 1
      scripts/postinst-intercepts/update_icon_cache

+ 1 - 1
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

+ 1 - 1
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