[oe-commits] Martin Jansa : font-util: Fix cross building, use PKG_CONFIG_PATH in MAPFILES_PATH test

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: c465d9fcf16a6e42afc2f984978ddeaacd9568d3
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c465d9fcf16a6e42afc2f984978ddeaacd9568d3

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Nov  8 10:03:38 2009 +0100

font-util: Fix cross building, use PKG_CONFIG_PATH in MAPFILES_PATH test

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/xorg-font/font-util-native_1.1.1.bb |    5 +++++
 recipes/xorg-font/font-util_1.1.1.bb        |    4 ++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/recipes/xorg-font/font-util-native_1.1.1.bb b/recipes/xorg-font/font-util-native_1.1.1.bb
index 32ea62c..2da3b0c 100644
--- a/recipes/xorg-font/font-util-native_1.1.1.bb
+++ b/recipes/xorg-font/font-util-native_1.1.1.bb
@@ -6,3 +6,8 @@ XORG_PN = "font-util"
 DEPENDS = "bdftopcf-native"
 
 PE = "1"
+PR = "r1"
+
+do_configure_prepend() {
+        sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in
+}
diff --git a/recipes/xorg-font/font-util_1.1.1.bb b/recipes/xorg-font/font-util_1.1.1.bb
index 3ba1c05..8e22276 100644
--- a/recipes/xorg-font/font-util_1.1.1.bb
+++ b/recipes/xorg-font/font-util_1.1.1.bb
@@ -9,3 +9,7 @@ RDEPENDS = "mkfontdir mkfontscale encodings"
 
 PR = "r1"
 PE = "1"
+
+do_configure_prepend() {
+        sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in
+}