[oe-commits] Stanislav Brabec : mc: Properly pass *_FOR_BUILD variables.

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 5c9878edf28117ed1a2e976bb98797f9b6f506e6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5c9878edf28117ed1a2e976bb98797f9b6f506e6

Author: Stanislav Brabec <utx at penguin.cz>
Date:   Thu Jan  7 21:51:47 2010 +0000

mc: Properly pass *_FOR_BUILD variables.

---

 recipes/mc/mc.inc |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/recipes/mc/mc.inc b/recipes/mc/mc.inc
index f7db53f..24ea394 100644
--- a/recipes/mc/mc.inc
+++ b/recipes/mc/mc.inc
@@ -17,6 +17,7 @@ ac_cv_path_PERL=${bindir}/perl \
 ac_cv_path_ZIP=${bindir}/zip \
 ac_cv_path_UNZIP=${bindir}/unzip \
 "
+EXTRA_OEMAKE = 'GLIB_CFLAGS_FOR_BUILD="$GLIB_CFLAGS_FOR_BUILD" GLIB_LIBS_FOR_BUILD="$GLIB_LIBS_FOR_BUILD" CC_FOR_BUILD="$CC_FOR_BUILD"'
 
 PACKAGES += "${PN}-extfs ${PN}-hilite"
 FILES_${PN} = "${bindir}/ ${libexecdir}/mc ${datadir}/mc/*.charsets ${datadir}/mc/*.ext ${datadir}/mc/*.hint ${datadir}/mc/*.hlp ${datadir}/mc/*.lib ${datadir}/mc/*.menu ${datadir}/mc/*.rc ${datadir}/mc/bin /etc/profile.d"
@@ -33,8 +34,10 @@ export CC_FOR_BUILD = "${BUILD_CC}"
 export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
 export LD_FOR_BUILD = "${BUILD_CC}"
 do_compile_prepend() {
-	export GLIB_CFLAGS_FOR_BUILD="`${STAGING_BINDIR_NATIVE}/pkg-config --cflags glib-2.0`"
-	export GLIB_LIBS_FOR_BUILD="`${STAGING_BINDIR_NATIVE}/pkg-config --libs glib-2.0`"
+	# FIXME: Ugly! Should be done globally with respect to the host system (in classes) instead of NATIVE_PKGCONFIG_PATH:
+	export HOST_PKG_CONFIG_PATH=
+	export GLIB_CFLAGS_FOR_BUILD="`PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH" PKG_CONFIG_SYSROOT_DIR="" pkg-config --cflags glib-2.0`"
+	export GLIB_LIBS_FOR_BUILD="`PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH" PKG_CONFIG_SYSROOT_DIR="" pkg-config --libs glib-2.0`"
 }
 
 do_install_append() {