summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/fontconfig
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-09-11 19:25:19 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 07:42:28 +0100
commit44fa30ffa23c9816f4eade57b4002f0c9fa89735 (patch)
tree3c085421e0e2069e169744a2ae8331ac002822e8 /meta/recipes-graphics/fontconfig
parentd14fb257881ab9b87fa53c68af5b09a755cb162f (diff)
downloadpoky-44fa30ffa23c9816f4eade57b4002f0c9fa89735.tar.gz
update_font_cache: update script for multilib
Packages which inherit fontcache.bbclass call postinstall script update_font_cache. And in update_font_cache, it calls ${bindir}/fc-cache by qemuwrapper. When multilib is enabled, both packages foo and lib32-foo will call ${bindir}/fc-cache and one of them will fail to run obviously. Duplicate install file fc-cache to ${libexecdir} with ${MLPREFIX} and call proper fc-cache in update_font_cache. (From OE-Core rev: 53d8625732b0c8416e367d5eef43863ec2065433) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/fontconfig')
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
index d4cbce80b4..cec524755d 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
@@ -35,9 +35,15 @@ do_configure_prepend() {
35 rm -f ${S}/src/fcobjshash.h ${S}/src/fcobjshash.gperf 35 rm -f ${S}/src/fcobjshash.h ${S}/src/fcobjshash.gperf
36} 36}
37 37
38do_install_append_class-target() {
39 # duplicate fc-cache for postinstall script
40 mkdir -p ${D}${libexecdir}
41 ln ${D}${bindir}/fc-cache ${D}${libexecdir}/${MLPREFIX}fc-cache
42}
43
38PACKAGES =+ "fontconfig-utils" 44PACKAGES =+ "fontconfig-utils"
39FILES_${PN} =+ "${datadir}/xml/*" 45FILES_${PN} =+ "${datadir}/xml/*"
40FILES_fontconfig-utils = "${bindir}/*" 46FILES_fontconfig-utils = "${bindir}/* ${libexecdir}/*"
41 47
42# Work around past breakage in debian.bbclass 48# Work around past breakage in debian.bbclass
43RPROVIDES_fontconfig-utils = "libfontconfig-utils" 49RPROVIDES_fontconfig-utils = "libfontconfig-utils"