[oe-commits] Richard Tollerton : font-util: Fix incorrect PKG_CONFIG_PATH

[git at git.openembedded.org]

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

Author: Richard Tollerton <rich.tollerton at ni.com>
Date:   Fri Dec 12 13:34:00 2014 -0600

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.

Signed-off-by: Richard Tollerton <rich.tollerton at ni.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8b42991..cc4258a 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"