[oe-commits] Ben Shelton : font-util: stage encoding maps into sysroot

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: a1598266c828ad0b73df971b22d6a2e3e1dd5cab
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a1598266c828ad0b73df971b22d6a2e3e1dd5cab

Author: Ben Shelton <ben.shelton at ni.com>
Date:   Fri Feb 20 13:02:33 2015 -0600

font-util: stage encoding maps into sysroot

font-util installs encoding maps into /usr/share/fonts/X11. This path
may not exist on the host (many distros install these into
/usr/share/fonts/util) so they must exist in the sysroot in order for
e.g. `pkg-config --variable=mapdir fontutil` to work correctly. However,
currently /usr/share/fonts is explicitly not installed into sysroots, so
the encoding maps were not getting found.

Fix this by explicitly staging ${datadir}/fonts/ into the sysroot.

Signed-off-by: Ben Shelton <ben.shelton at ni.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
index cc4258a..a067a75 100644
--- a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
+++ b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
@@ -24,3 +24,8 @@ BBCLASSEXTEND = "native"
 
 SRC_URI[md5sum] = "ddfc8a89d597651408369d940d03d06b"
 SRC_URI[sha256sum] = "dfa9e55625a4e0250f32fabab1fd5c8ffcd2d1ff2720d6fcf0f74bc8a5929195"
+
+SYSROOT_PREPROCESS_FUNCS += "fontutil_sysroot_preprocess"
+fontutil_sysroot_preprocess () {
+	sysroot_stage_dir ${D}${datadir}/fonts/ ${SYSROOT_DESTDIR}${datadir}/fonts/
+}