mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

fontcache: allow to pass different fontconfig cache dir

Browse Source 
(From OE-Core rev: adfb970efcb30af9b3b420b06b66e2aa6cc00ab4)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2015-04-21 12:53:40 +02:00
committed by Richard Purdie
parent 28e8418644
commit 2a9486875d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/fontcache.bbclass
+2 -2
View File
@@ -8,11 +8,11 @@ inherit qemu
FONT_PACKAGES ??= "${PN}" FONT_PACKAGES ??= "${PN}"
FONT_EXTRA_RDEPENDS ?= "fontconfig-utils" FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
fontcache_common() { fontcache_common() {
if [ "x$D" != "x" ] ; then if [ "x$D" != "x" ] ; then
$INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \ $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 else
fc-cache fc-cache
fi fi
meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
+3 -1
View File
@@ -37,6 +37,8 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
inherit autotools pkgconfig 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" BBCLASSEXTEND = "native"
scripts/postinst-intercepts/update_font_cache
+1 -3
View File
@@ -2,6 +2,4 @@
PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
$D${bindir}/fc-cache --sysroot=$D $D${bindir}/fc-cache --sysroot=$D
chown -R root:root $D${localstatedir}/cache/fontconfig chown -R root:root $D${fontconfigcachedir}