summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-04-07 13:21:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 07:20:25 +0100
commit29361a0e07e17dd9e002e2eb39b6e75c87dc772f (patch)
treed7c8a5b6621f1c232541922222caa26c4547bdf2
parent71db5767a875ca2834eb2434ff67b4af56d77920 (diff)
downloadpoky-29361a0e07e17dd9e002e2eb39b6e75c87dc772f.tar.gz
fontcache: allow to pass different fontconfig cache dir
(From OE-Core rev: 40f7986313277ef815b19331388bca124187bfeb) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/fontcache.bbclass4
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb4
-rw-r--r--scripts/postinst-intercepts/update_font_cache4
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index dfbdfa1e02..d122387ffd 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -8,11 +8,11 @@ inherit qemu
8 8
9FONT_PACKAGES ??= "${PN}" 9FONT_PACKAGES ??= "${PN}"
10FONT_EXTRA_RDEPENDS ?= "fontconfig-utils" 10FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
11 11FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
12fontcache_common() { 12fontcache_common() {
13if [ "x$D" != "x" ] ; then 13if [ "x$D" != "x" ] ; then
14 $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \ 14 $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \
15 libdir=${libdir} base_libdir=${base_libdir} localstatedir=${localstatedir} 15 libdir=${libdir} base_libdir=${base_libdir} fontconfigcachedir=${FONTCONFIG_CACHE_DIR}
16else 16else
17 fc-cache 17 fc-cache
18fi 18fi
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
index 797b3218b5..7c5b4b4bf9 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"
37 37
38inherit autotools pkgconfig 38inherit autotools pkgconfig
39 39
40EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts" 40FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
41
42EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR}"
41 43
42BBCLASSEXTEND = "native" 44BBCLASSEXTEND = "native"
diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache
index 3907f25f19..c8c6018f27 100644
--- a/scripts/postinst-intercepts/update_font_cache
+++ b/scripts/postinst-intercepts/update_font_cache
@@ -2,6 +2,4 @@
2 2
3PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ 3PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
4 $D${bindir}/fc-cache --sysroot=$D 4 $D${bindir}/fc-cache --sysroot=$D
5chown -R root:root $D${localstatedir}/cache/fontconfig 5chown -R root:root $D${fontconfigcachedir}
6
7