From 068a9f5cbeb589aac1843e59dffc944784971cae Mon Sep 17 00:00:00 2001 From: Richard Tollerton Date: Fri, 12 Dec 2014 13:34:00 -0600 Subject: font-util: Fix incorrect PKG_CONFIG_PATH PKG_CONFIG_PATH always defaults to /usr/lib/pkgconfig, and the host /usr/lib/pkgconfig is always checked as a fallback; however, PKG_CONFIG_PATH is currently (incorrectly) set to /usr/lib/pkg-config in the sysroot, which doesn't exist. On host distros where the font encoding maps are stored under a different path than OE, this will break font builds, because ucs2any will attempt to read the sysroot's encoding maps with the host paths. (From OE-Core rev: 89a29a3ad0742cd713e739d3d460be7711966679) (From OE-Core rev: f80a57a6c2a101ba4832899d88171fdb23977af2) Signed-off-by: Richard Tollerton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-graphics/xorg-font') 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 8b42991d1c..cc4258ad7b 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 @@ -17,7 +17,7 @@ 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}/pkg-config\" pkg-config#g" ${S}/fontutil.m4.in + 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" -- cgit v1.2.3-54-g00ecf