瀏覽代碼

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>
Ross Burton 9 年之前
父節點
當前提交
da386d3d21
共有 2 個文件被更改,包括 2 次插入2 次删除
  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