sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Ross Burton 2015-10-27 17:52:47 +00:00 committed by Richard Purdie
parent 63a0311497
commit da386d3d21
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/gtk-icon-cache.bbclass
View File

@ -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

2
scripts/postinst-intercepts/update_icon_cache
View File

@ -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