1 files changed, 15 insertions, 4 deletions

diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index d122387ffd..8ebdfc4f5c 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -9,12 +9,23 @@ inherit qemu
 FONT_PACKAGES ??= "${PN}"
 FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
 FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
+FONTCONFIG_CACHE_PARAMS ?= "-v"
+# You can change this to e.g. FC_DEBUG=16 to debug fc-cache issues,
+# something has to be set, because qemuwrapper is using this variable after -E
+# multiple variables aren't allowed because for qemu they are separated
+# by comma and in -n "$D" case they should be separated by space
+FONTCONFIG_CACHE_ENV ?= "FC_DEBUG=1"
 fontcache_common() {
-if [ "x$D" != "x" ] ; then
-        $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \
-                libdir=${libdir} base_libdir=${base_libdir} fontconfigcachedir=${FONTCONFIG_CACHE_DIR}
+if [ -n "$D" ] ; then
+        $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} \
+                'bindir="${bindir}"' \
+                'libdir="${libdir}"' \
+                'base_libdir="${base_libdir}"' \
+                'fontconfigcachedir="${FONTCONFIG_CACHE_DIR}"' \
+                'fontconfigcacheparams="${FONTCONFIG_CACHE_PARAMS}"' \
+                'fontconfigcacheenv="${FONTCONFIG_CACHE_ENV}"'
 else
-        fc-cache
+        ${FONTCONFIG_CACHE_ENV} fc-cache ${FONTCONFIG_CACHE_PARAMS}
 fi
 }