Introduce STAGING_BINDIR_CROSS and STAGING_BINDIR_NATIVE as discussed on the mailing list. There should be no functionality changes yet.

6 files changed, 7 insertions, 7 deletions

diff --git a/packages/nonworking/bogl/libbogl_0.1.9.bb b/packages/nonworking/bogl/libbogl_0.1.9.bb
index e9198eae89..db18ee3160 100644
--- a/packages/nonworking/bogl/libbogl_0.1.9.bb
+++ b/packages/nonworking/bogl/libbogl_0.1.9.bb
@@ -8,8 +8,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/b/bogl/bogl_${PV}-${PR}.tar.gz"
 S = "${WORKDIR}/bogl"
 
 do_compile() {
-	ln -sf ${STAGING_BINDIR}/bdftobogl .
-	ln -sf ${STAGING_BINDIR}/pngtobogl .
+	ln -sf ${STAGING_BINDIR_NATIVE}/bdftobogl .
+	ln -sf ${STAGING_BINDIR_NATIVE}/pngtobogl .
 	oe_runmake libbogl.so.0.1 libbogl.a
 }
 
diff --git a/packages/nonworking/e17/evidence b/packages/nonworking/e17/evidence
index d1e8bd5065..84a47ff570 100644
--- a/packages/nonworking/e17/evidence
+++ b/packages/nonworking/e17/evidence
@@ -10,7 +10,7 @@ inherit e
 SRC_URI = "cvs://anonymous@evidence.cvs.sourceforge.net/cvsroot/evidence;module=evidence;date=${PV}"
 S = "${WORKDIR}/evidence"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
 	--enable-ecore \
 	--enable-ecore-ipc \
 	--enable-canvas-evas2 \
diff --git a/packages/nonworking/lzma/lzma_0.01.bb b/packages/nonworking/lzma/lzma_0.01.bb
index 2530dc4211..ec710c45fa 100644
--- a/packages/nonworking/lzma/lzma_0.01.bb
+++ b/packages/nonworking/lzma/lzma_0.01.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/"
 inherit qmake
 
 do_configure_prepend() {
-	${STAGING_BINDIR}/qmake -project -o lzma.pro
+	${STAGING_BINDIR_NATIVE}/qmake -project -o lzma.pro
 }
 
 do_install_append () {
diff --git a/packages/nonworking/qtella/qtella_0.6.5.bb b/packages/nonworking/qtella/qtella_0.6.5.bb
index 80e975b578..0ef738a16a 100644
--- a/packages/nonworking/qtella/qtella_0.6.5.bb
+++ b/packages/nonworking/qtella/qtella_0.6.5.bb
@@ -6,6 +6,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/qtella/qtella-${PV}.tar.gz"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-qt-dir=${STAGING_LIBDIR}/.. --with-qt-moc=${STAGING_BINDIR}/moc --with-qt-uic=${STAGING_BINDIR}/uic \
+EXTRA_OECONF = "--with-qt-dir=${STAGING_LIBDIR}/.. --with-qt-moc=${STAGING_BINDIR_NATIVE}/moc --with-qt-uic=${STAGING_BINDIR_NATIVE}/uic \
 		--with-qt-includes=${STAGING_INCDIR}/ --with-qt-libs=${STAGING_LIBDIR}/ --with-kde=no --enable-sharp"
 
diff --git a/packages/nonworking/r/r_2.0.0.bb b/packages/nonworking/r/r_2.0.0.bb
index a7286fef1b..4a0004fb55 100644
--- a/packages/nonworking/r/r_2.0.0.bb
+++ b/packages/nonworking/r/r_2.0.0.bb
@@ -40,5 +40,5 @@ do_compile_prepend () {
 }
 
 do_compile() {
-	oe_runmake 'R_EXE_NATIVE = ${STAGING_BINDIR}/R'
+	oe_runmake 'R_EXE_NATIVE = ${STAGING_BINDIR_NATIVE}/R'
 }
diff --git a/packages/nonworking/zethereal/zethereal_1.0.0.bb b/packages/nonworking/zethereal/zethereal_1.0.0.bb
index aaa3a34c36..de4830cb64 100644
--- a/packages/nonworking/zethereal/zethereal_1.0.0.bb
+++ b/packages/nonworking/zethereal/zethereal_1.0.0.bb
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--disable-ethereal \
                 --with-zlib=${STAGING_LIBDIR}/.. \
                 --without-x"
 
-export GLIB_CONFIG = "${STAGING_BINDIR}/glib-config"
+export GLIB_CONFIG = "${STAGING_BINDIR_CROSS}/glib-config"
 
 CFLAGS += "-I${STAGING_INCDIR}/glib-1.2"
 LIBS += "-lglib-1.2"