summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2015-02-20 13:02:34 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-21 22:05:35 +0000
commitab18ec78982866291e656f209b8652cf8c28b17a (patch)
treedb5acebe36fea912bf592974d8dd3a323ffb063a /meta/recipes-graphics
parentf220b969a18cb505f7a74679c5e9c27f2b8811b6 (diff)
downloadpoky-ab18ec78982866291e656f209b8652cf8c28b17a.tar.gz
font-util: remove MAPFILES_PATH override
MAPFILES_PATH is a configuration variable that is used by packages using font-util, which tells those packages how to compute it in fontutil.m4. Presently, we're manually twiddling things so that MAPFILES_PATH will consult the native sysroot, when building under *any* architecture. This complicates building other packages immensely, and also generates broken on-target packages, because the contents of font-util-dev will reference the native sysroot on the build machine (!). We don't even need to twiddle MAPFILES_PATH anymore so just delete it. This code also had a path bug (referencing /usr/lib/pkg-config instead of /usr/lib/pkgconfig) which is also fixed by deletion. (From OE-Core rev: 4199703db82d79408e0575e1332ad79375e14c39) Signed-off-by: Richard Tollerton <rich.tollerton@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-font/font-util_1.3.0.bb4
1 files changed, 0 insertions, 4 deletions
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 a067a75869..03f70bfe67 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
@@ -16,10 +16,6 @@ RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native"
16 16
17PR = "${INC_PR}.0" 17PR = "${INC_PR}.0"
18 18
19do_configure_prepend() {
20 sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkgconfig\" pkg-config#g" ${S}/fontutil.m4.in
21}
22
23BBCLASSEXTEND = "native" 19BBCLASSEXTEND = "native"
24 20
25SRC_URI[md5sum] = "ddfc8a89d597651408369d940d03d06b" 21SRC_URI[md5sum] = "ddfc8a89d597651408369d940d03d06b"