[OE-core] [PATCH v3 0/3] xorg-font: stop trying to use build machine's encoding maps
Richard Tollerton
rich.tollerton at ni.com
Tue Feb 3 00:47:32 UTC 2015
(This is just a rebase with no changes and small cover letter changes vs v2.
However, I believe this patchset should also fix font build problems introduced
by "font-util: Fix incorrect PKG_CONFIG_PATH".)
Several xorg-font builds were added to meta-oe recently. These builds tend to
fail on several Linux distros because they referenced encoding maps (e.g.
map-ISO8859-1) at native paths outside the sysroot, which don't exist; the build
expects /usr/share/fonts/X11/util/map-ISO8859-1 to exist, but the distro
actually installed it at /usr/share/fonts/util/map-ISO8859-1. Of course, the
correct behavior is for the build to reference the appropriate path under the
appropriate sysroot.
There are two different root causes. The first and by far the most important
cause is that we're explicitly blacklisting ${datadir}/fonts from staging, so it
was never possible for these maps to be sourced from sysroots in the first
place. This seems like a silly thing to do, and I could not find any
justification for it in the commit history, so I propose getting rid of it.
Once that was out of the way, I cleaned up some existing chicanery involving
where to look for the maps. In particular, presently font-util is hardcoding the
path to point at the native sysroot, for *all* architectures. Again, this seems
silly, I can't find any justification for it, and it breaks builds; I propose
getting rid of it.
These changes will ultimately require font recipes to depend on font-util
in addition to font-util-native, which will be handled in a separate patchset.
Until then, the builds of font packages and font-util will race.
Richard Tollerton (3):
staging.bbclass: Install ${datadir}/fonts/ into sysroots
font-util: remove MAPFILES_PATH override
xorg-font-common: fix sysroot injection for encoding maps
meta/classes/staging.bbclass | 2 +-
meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 4 ----
meta/recipes-graphics/xorg-font/xorg-font-common.inc | 8 +-------
3 files changed, 2 insertions(+), 12 deletions(-)
--
2.2.2
More information about the Openembedded-core
mailing list