From ab18ec78982866291e656f209b8652cf8c28b17a Mon Sep 17 00:00:00 2001 From: Richard Tollerton Date: Fri, 20 Feb 2015 13:02:34 -0600 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'meta/recipes-graphics') 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" PR = "${INC_PR}.0" -do_configure_prepend() { - sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkgconfig\" pkg-config#g" ${S}/fontutil.m4.in -} - BBCLASSEXTEND = "native" SRC_URI[md5sum] = "ddfc8a89d597651408369d940d03d06b" -- cgit 1.2.3-korg