diff options
| author |   Ross Burton <ross.burton@intel.com> | 2015-10-27 17:52:47 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-29 07:26:39 +0000 |
| commit | 0fe84007176c98644b1917966c98501beb7e0ce2 (patch) | |
| tree | 6cadb6590554238f45ff78bc05e2042e43425f41 | |
| parent | 38a6ecf0070a60eb14b353b158b70ddc919ad328 (diff) | |
| download | openembedded-core-0fe84007176c98644b1917966c98501beb7e0ce2.tar.gz | |
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>
| -rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 2 | ||||
| -rw-r--r-- | scripts/postinst-intercepts/update_icon_cache | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index 425397af3a..0f1052b08c 100644 --- 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 df9bdecc99..9cf2a72a0c 100644 --- 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 |