From: Ross Burton <ross.burton@intel.com>
Date: Tue, 20 Oct 2015 19:19:27 +0000 (+0100)
Subject: classes/gtk-icon-cache: don't pass STAGING_LIBDIR_NATIVE to intercepts
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~28528
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=189d6232a2a9eb7192887b60f05b6643414a4ec6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

classes/gtk-icon-cache: don't pass STAGING_LIBDIR_NATIVE to intercepts

The intercept doesn't need STAGING_LIBDIR_NATIVE anymore, so don't pass it.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 6195fa4526f..425397af3a9 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -6,8 +6,7 @@ gtk_icon_cache_postinst() {
 if [ "x$D" != "x" ]; then
 	$INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \
 		mlprefix=${MLPREFIX} \
-		libdir=${libdir} \
-		STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE}
+		libdir=${libdir}
 else
 
 	# Update the pixbuf loaders in case they haven't been registered yet
@@ -25,8 +24,7 @@ gtk_icon_cache_postrm() {
 if [ "x$D" != "x" ]; then
 	$INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \
 		mlprefix=${MLPREFIX} \
-		libdir=${libdir} \
-		STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE}
+		libdir=${libdir}
 else
 	for icondir in /usr/share/icons/* ; do
 		if [ -d $icondir ] ; then