Signed-off-by: Martin Jansa <[email protected]>
---
v2: added --with-cache-dir to fontconfig EXTRA_OECONF in case that was
what Ross wanted
meta/classes/fontcache.bbclass | 4 ++--
meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb | 4 +++-
scripts/postinst-intercepts/update_font_cache | 4 +---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index dfbdfa1..d122387 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -8,11 +8,11 @@ inherit qemu
FONT_PACKAGES ??= "${PN}"
FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
-
+FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
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}
localstatedir=${localstatedir}
+ libdir=${libdir} base_libdir=${base_libdir}
fontconfigcachedir=${FONTCONFIG_CACHE_DIR}
else
fc-cache
fi
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
index 797b321..7c5b4b4 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
@@ -37,6 +37,8 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
inherit autotools pkgconfig
-EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts"
+FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
+
+EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts
--with-cache-dir=${FONTCONFIG_CACHE_DIR}"
BBCLASSEXTEND = "native"
diff --git a/scripts/postinst-intercepts/update_font_cache
b/scripts/postinst-intercepts/update_font_cache
index 3907f25..c8c6018 100644
--- a/scripts/postinst-intercepts/update_font_cache
+++ b/scripts/postinst-intercepts/update_font_cache
@@ -2,6 +2,4 @@
PSEUDO_UNLOAD=1 qemuwrapper -L $D -E
LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
$D${bindir}/fc-cache --sysroot=$D
-chown -R root:root $D${localstatedir}/cache/fontconfig
-
-
+chown -R root:root $D${fontconfigcachedir}
--
2.3.5
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
