]> git.openpandora.org Git - openembedded.git/commitdiff
Introduce STAGING_BINDIR_CROSS and STAGING_BINDIR_NATIVE as discussed on the mailing...
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 29 Nov 2006 11:34:04 +0000 (11:34 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Wed, 29 Nov 2006 11:34:04 +0000 (11:34 +0000)
130 files changed:
classes/ccdv.bbclass
classes/distutils.bbclass
classes/insane.bbclass
classes/mozilla.bbclass
classes/native.bbclass
classes/qmake-base.bbclass
classes/qt3e.bbclass
classes/qt3x11.bbclass
classes/qt4x11.bbclass
classes/rubyextension.bbclass
classes/scons.bbclass
conf/bitbake.conf
packages/apmd/apmd_3.2.2.bb
packages/apr/apr-util_0.9.12.bb
packages/apr/apr-util_1.1.2.bb
packages/apt/files/apt.conf
packages/asterisk/asterisk-1.0.9/makefile.patch
packages/asterisk/asterisk-1.2.8/makefile.patch
packages/asterisk/asterisk_1.2.12.1.bb
packages/asterisk/asterisk_1.2.13.bb
packages/asterisk/asterisk_1.2.9.1.bb
packages/avetanabt/avetanabt_20060413.bb
packages/avetanabt/avetanabt_cvs.bb
packages/clearsilver/clearsilver_0.10.3.bb
packages/dejagnu/dejagnu-qemu_1.0.bb
packages/dillo/dillo_0.8.6.bb
packages/e17/e-iconbar_20060128.bb
packages/e17/e-wm_0.16.999.036.bb
packages/e17/eclair_20060128.bb
packages/e17/engage_20060128.bb
packages/e17/entice_20060128.bb
packages/e17/entice_20060416.bb
packages/e17/entrance_0.9.0.007.bb
packages/e17/examine_20060128.bb
packages/gnome/gconf_2.6.1.bb
packages/gnome/gnome-vfs_2.12.0.bb
packages/gnome/gnome-vfs_2.6.0.bb
packages/gnome/gnome-vfs_2.6.2.bb
packages/gnome/libbonobo_2.10.0.bb
packages/gnome/libbonobo_2.14.0.bb
packages/gnome/libbonobo_2.6.0.bb
packages/gnome/libbonobo_2.6.2.bb
packages/gnome/orbit2_2.10.2.bb
packages/gnome/orbit2_2.13.2.bb
packages/gnome/orbit2_2.14.0.bb
packages/gsoap/gsoap_2.7.7.bb
packages/gtk+/gtk+-1.2_1.2.10.bb
packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
packages/gtkhtml/gtkhtml-3.0_3.0.10.bb
packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
packages/ion/ion3_0.0+ds20041104.bb
packages/ixp4xx/ixp4xx-npe_2.1.bb
packages/ixp4xx/ixp4xx-npe_2.3.bb
packages/jpeg/jpeg_6b.bb
packages/kaffe/kaffe-qt_cvs.bb
packages/kf/kf_0.5.4.1.bb
packages/konqueror/konqueror-embedded_20030705.bb
packages/konqueror/konqueror-embedded_20060404.bb
packages/kphonepi/kphonepi_1.0.0.bb
packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
packages/lbreakout/lbreakout2_2.6beta.bb
packages/libgcrypt/libgcrypt_1.1.91.bb
packages/libgcrypt/libgcrypt_1.2.0.bb
packages/libgcrypt/libgcrypt_1.2.1.bb
packages/libgcrypt/libgcrypt_1.2.2.bb
packages/libgcrypt/libgcrypt_1.2.3.bb
packages/libgpg-error/libgpg-error_0.6.bb
packages/libgpg-error/libgpg-error_0.7.bb
packages/libgpg-error/libgpg-error_1.0.bb
packages/libgpg-error/libgpg-error_1.3.bb
packages/libmikmod/libmikmod_3.1.11.bb
packages/libnet/libnet_1.0.2a.bb
packages/libol/libol_0.3.16.bb
packages/libol/libol_0.3.18.bb
packages/libopie/libopie2.inc
packages/libqpe/libqpe-opie.inc
packages/libqtaux/libqtaux2.inc
packages/libsdl/libsdl-mixer_1.2.6.bb
packages/libxine/libxine_1.1.0.bb
packages/linux/ixp4xx-kernel-svnpatch.inc
packages/misc-binary-only/tda1004x-firmware.bb
packages/mysql/mysql_4.1.18.bb
packages/nonworking/bogl/libbogl_0.1.9.bb
packages/nonworking/e17/evidence
packages/nonworking/lzma/lzma_0.01.bb
packages/nonworking/qtella/qtella_0.6.5.bb
packages/nonworking/r/r_2.0.0.bb
packages/nonworking/zethereal/zethereal_1.0.0.bb
packages/omniorb/omniorb_4.0.7.bb
packages/perl/perl.inc
packages/perl/perl_5.8.7.bb
packages/php/php.inc
packages/php/php_5.1.4.bb
packages/postfix/postfix_2.0.20.bb
packages/puzzles/puzzles_r6915.bb
packages/python/python-pygtk2_2.10.3.bb
packages/python/python-pygtk2_2.8.6.bb
packages/python/python-pyqt4_4.0.bb
packages/python/python-pyqt_3.13.bb
packages/python/python_2.4.3.bb
packages/qt/qt-x11-free-native_3.3.5.bb
packages/qt/qt-x11-free_3.3.6.bb
packages/qt/qt4-x11-free_4.1.2.bb
packages/qte/qte-common_2.3.10.inc
packages/quake/quake1_0.0.1.bb
packages/rdiff-backup/rdiff-backup.inc
packages/regina-rexx/files/use-proper-host-tools.patch
packages/regina-rexx/regina-rexx_3.3.bb
packages/skippy/skippy-xd_0.5.0.bb
packages/subversion/subversion_1.3.1.bb
packages/subversion/subversion_1.4.0.bb
packages/supertux/supertux_0.1.2.bb
packages/swig/swig_1.3.24.bb
packages/swig/swig_1.3.29.bb
packages/syslog-ng/syslog-ng_1.6.11.bb
packages/syslog-ng/syslog-ng_1.6.8.bb
packages/tcltk/tcl_8.4.11.bb
packages/tcltk/tk_8.4.11.bb
packages/tetex/tetex_3.0.bb
packages/tmake/tmake_1.11.bb
packages/uboot/u-boot_1.1.2.bb
packages/uboot/u-boot_1.1.4.bb
packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
packages/wxbase/wxbase_2.6.2.bb
packages/wxbase/wxbase_2.7+cvs.bb
packages/xmms/xmms-mad_0.10.bb
packages/xqt/xqt_0.0.9.bb
packages/xqt2/xqt2_20060509.bb
packages/zope/zope_2.7.1.bb
packages/zope/zope_2.9.2.bb

index a28ea672e5f2607c7edb11ebf8d3f452356d6963..8c8306cbf1ea8418a15282250b486128b47bf155 100644 (file)
@@ -10,7 +10,7 @@ python () {
 def quiet_libtool(bb,d):
        deps = (bb.data.getVar('DEPENDS', d, 1) or "").split()
        if 'libtool-cross' in deps:
-               return "'LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool --silent'"
+               return "'LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool --silent'"
        elif 'libtool-native' in deps:
                return "'LIBTOOL=${B}/${HOST_SYS}-libtool --silent'"
        else:
index a2b0e2b7704627c864d333df0159a7fa65a7873f..5f57a9ea199e94d43f7594ff2467e701f439bc2a 100644 (file)
@@ -2,13 +2,13 @@ inherit distutils-base
 
 distutils_do_compile() {
        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-       ${STAGING_BINDIR}/python setup.py build || \
+       ${STAGING_BINDIR_NATIVE}/python setup.py build || \
        oefatal "python setup.py build execution failed."
 }
 
 distutils_do_install() {
        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-       ${STAGING_BINDIR}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
+       ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
        oefatal "python setup.py install execution failed."
 }
 
index 4ff867b62f68a82d8b09894b843da16f21650779..e30375288d06e71373da98ba18205a6ec01d97ff 100644 (file)
@@ -28,7 +28,7 @@ def package_qa_check_rpath(file,name,d):
     Check for dangerous RPATHs
     """
     import bb, os
-    scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR',d,True),'scanelf')
+    scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf')
     bad_dir = bb.data.getVar('TMPDIR', d, True) + "/work"
     if not os.path.exists(scanelf):
         bb.note("Can not check RPATH scanelf not found")
index 3295c2b27050c593ddde53991666865276b03f0f..bd8e9193d92fb50b471a77d35b36ef2b710d1ef8 100644 (file)
@@ -19,7 +19,7 @@ export MOZ_OBJDIR = "${S}"
 export CONFIGURE_ARGS = "${EXTRA_OECONF}"
 export HOST_LIBIDL_CFLAGS = "`${HOST_LIBIDL_CONFIG} --cflags`"
 export HOST_LIBIDL_LIBS = "`${HOST_LIBIDL_CONFIG} --libs`"
-export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_BINDIR}/../share/pkgconfig pkg-config libIDL-2.0"
+export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_DIR}/${BUILD_SYS}/share/pkgconfig pkg-config libIDL-2.0"
 export HOST_CC = "${BUILD_CC}"
 export HOST_CXX = "${BUILD_CXX}"
 export HOST_CFLAGS = "${BUILD_CFLAGS}"
@@ -33,8 +33,8 @@ mozilla_do_configure() {
                set -e
                for cg in `find ${S} -name config.guess`; do
                        install -m 0755 \
-                       ${STAGING_BINDIR}/../share/gnu-config/config.guess \
-                       ${STAGING_BINDIR}/../share/gnu-config/config.sub \
+                       ${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.guess \
+                       ${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.sub \
                        `dirname $cg`/
                done
        )
index 04ff7d92d1dba64462ab72569d75d8b68da7c9c4..556c0e17e2a6f4423cb593cba188532e8a4b2d8e 100644 (file)
@@ -36,6 +36,8 @@ CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
 LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib "
 
+STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
+STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
 
 # set the compiler as well. It could have been set to something else
 export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
index 36ecfb622f7824df862806f9a2421fcfad41a22f..09694e97b8f090219ab74278cb5d2dbf03c2e870 100644 (file)
@@ -14,10 +14,10 @@ export OE_QMAKE_LDFLAGS="${LDFLAGS}"
 export OE_QMAKE_LINK="${CCLD}"
 export OE_QMAKE_AR="${AR}"
 export OE_QMAKE_STRIP="${STRIP}"
-export OE_QMAKE_UIC="${STAGING_BINDIR}/uic"
-export OE_QMAKE_MOC="${STAGING_BINDIR}/moc"
+export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
+export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
 export OE_QMAKE_RCC="non-existant"
-export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake"
+export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
 export OE_QMAKE_RPATH="-Wl,-rpath-link,"
 
 # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11
index c34d7c04f59c8938d61f75f355b6ddd9e796aec1..58a6779af6e47543da25fa64308de7ea99da0cb8 100644 (file)
@@ -3,8 +3,8 @@
 #
 export QTDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
 export QTEDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
-export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3"
-export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3"
+export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
+export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
 export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
 export OE_QMAKE_INCDIR_QT="${QTEDIR}/include"
 export OE_QMAKE_LIBDIR_QT="${QTEDIR}/lib"
index 6e3d5f8ba2dbcca1af8731ec6cec0a82d72f68a0..24e824d06f72b8df369607a692a6f7924aac9170 100644 (file)
@@ -4,8 +4,8 @@ EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
 # override variables set by qmake-base to compile Qt/X11 apps
 #
 export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
-export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic3"
-export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc3"
+export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3"
+export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc3"
 export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"
 export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
 export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
index 635fc676944ce1425a2b881091bbf78fdffbf08e..cb836cc36265fadf3704ea62b8ef40a784af4c38 100644 (file)
@@ -5,10 +5,10 @@ DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-fr
 #
 export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
 export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
-export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic4"
-export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc4"
-export OE_QMAKE_RCC = "${STAGING_BINDIR}/rcc4"
-export OE_QMAKE_QMAKE = "${STAGING_BINDIR}/qmake2"
+export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
+export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
+export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
+export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
 export OE_QMAKE_LINK = "${CXX}"
 export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
 export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
index 9c9d66e2602b1d226c868ec35d6153d30da4da70..628ebdb7c72d8210ddc0d8012cd33bfe239245f6 100644 (file)
@@ -2,17 +2,17 @@ DEPENDS  += "ruby-native"
 RDEPENDS += "ruby"
 
 rubyextension_do_configure() {
-       ${STAGING_BINDIR}/ruby setup.rb config || \
+       ${STAGING_BINDIR_NATIVE}/ruby setup.rb config || \
        oefatal "ruby setup.rb config stage failed."
 }
 
 rubyextension_do_compile() {
-       ${STAGING_BINDIR}/ruby setup.rb setup || \
+       ${STAGING_BINDIR_NATIVE}/ruby setup.rb setup || \
        oefatal "ruby setup.rb setup stage failed."
 }
 
 rubyextension_do_install() {
-       ${STAGING_BINDIR}/ruby setup.rb install || \
+       ${STAGING_BINDIR_NATIVE}/ruby setup.rb install || \
        oefatal "ruby setup.rb install stage failed."
 }
 
index 3160eca69a71991da4e71b3be29a16762b7ab104..89b5da2d0e76f8d4aa7ba0a7e2877a5066d03f94 100644 (file)
@@ -1,12 +1,12 @@
 DEPENDS += "python-scons-native"
 
 scons_do_compile() {
-        ${STAGING_BINDIR}/scons || \
+        ${STAGING_BINDIR_NATIVE}/scons || \
         oefatal "scons build execution failed."
 }
 
 scons_do_install() {
-        ${STAGING_BINDIR}/scons install || \
+        ${STAGING_BINDIR_NATIVE}/scons install || \
         oefatal "scons install execution failed."
 }
 
index 92c7cef2dd505361cd27bb8b6a6d975503b8ef56..b06e2bb3d42d714fb8c5022457af9903ee1465e5 100644 (file)
@@ -154,6 +154,9 @@ B = "${S}"
 
 STAGING_DIR = "${TMPDIR}/staging"
 STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin"
+# Set these to the same a STAGING_BINDIR for now
+STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
+STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin"
 STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
 STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
 STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
index 4a23f39590fd0c1886d15bbab3d6f54effd6835a..94541581d35547a0f310aa957e36397eb34ad606 100644 (file)
@@ -22,7 +22,7 @@ INITSCRIPT_NAME = "apmd"
 INITSCRIPT_PARAMS = "defaults"
 
 do_compile() {
-       oe_runmake "LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool" apm apmd
+       oe_runmake "LIBTOOL=${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" apm apmd
 }
 
 do_stage() {
index ba6e38241daf6ff5735c2a70b6b3372092e179cf..776fd03bfe5e29faf5ae93ee41ab67517ed6d396 100644 (file)
@@ -9,7 +9,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
            file://gen_uri_delims.patch;patch=1 \
            file://uri_delims.h"
 
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
 
 inherit autotools lib_package binconfig
 
index ad89228fff9c2d462334f0a0af2aa69cb607fc44..ec1998d64b6ff114c39fbd1e3e4ee9911b76441d 100644 (file)
@@ -8,7 +8,7 @@ PR = "r0"
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz"
 
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
 
 inherit autotools lib_package binconfig
 
index 37785871db6dccafc2a9c0f39eed6621dcc65821..fc19018533afe05481b10d32a6733c250d632cb6 100644 (file)
@@ -11,7 +11,7 @@ Dir "${STAGING_DIR}/"
       pkgcache "";
       srcpkgcache "";
    };
-   Bin "${STAGING_BINDIR}/"
+   Bin "${STAGING_BINDIR_NATIVE}/"
    {
       methods "${STAGING_LIBDIR}/apt/methods/";
       gzip "/bin/gzip";
index 066fb677dc52098d3b0b3ee8f74b1b1f882f45ec..6684d8696e3bd4f526d590e426b5ca0304431ba9 100644 (file)
  
  # Add GTK console if appropriate
 -PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
-+PBX_LIBS+=$(shell ${STAGING_BINDIR}/gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
++PBX_LIBS+=$(shell ${STAGING_BINDIR_CROSS}/gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
  # Add KDE Console if appropriate
  #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
  
index c786d090176afd2e4b6c5d87e6636de891e70731..780868b91e3a92f461e95bba729814a7d73e2a4f 100644 (file)
@@ -11,7 +11,7 @@
  # If cross compiling, define these to suit
 +CROSS_COMPILE=$(CROSS_DIR)
 +CROSS_COMPILE_TARGET=$(STAGING_DIR)
-+CROSS_COMPILE_BIN=$(STAGING_BINDIR)
++CROSS_COMPILE_BIN=$(STAGING_BINDIR_CROSS)
  # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
  # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
  # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
index c27963c9a0ec426696e4624c8ad17f29b85fedaf..c0b7fc2ed94a111603cbe65cb960819a8464bef9 100644 (file)
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 
 
 export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
-export CROSS_COMPILE_BIN="${STAGING_BINDIR}"
+export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
 export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
 
 export CROSS_ARCH="Linux"
index 224b367de6908a7259dc1e0fce4cafe382ac16f9..42a3214f0a96b782f837d9871129a7704c9445bd 100644 (file)
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 
 
 export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
-export CROSS_COMPILE_BIN="${STAGING_BINDIR}"
+export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
 export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
 
 export CROSS_ARCH="Linux"
index 00da4ab33fb0ae436faccd2a6ce5bb0b56046bf4..c1cedf67f66586cbd9264ab6cb8b4e792bf74539 100644 (file)
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 
 
 export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
-export CROSS_COMPILE_BIN="${STAGING_BINDIR}"
+export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
 export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
 
 export CROSS_ARCH="Linux"
index b04a9e5552e5594e3304ea91d1c5bd852ebf0644..5140b078744385fc92962c7d5a3d8c29c0bb1dba 100644 (file)
@@ -23,8 +23,8 @@ do_compile() {
 
   # generate classes
   # javac -> jikes
-  ${STAGING_BINDIR}/find {de,javax,com} -iname *.java > file.list
-  ${STAGING_BINDIR}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+  ${STAGING_BINDIR_NATIVE}/find {de,javax,com} -iname *.java > file.list
+  ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
 
   # create own version.xml (add version information available at runtime)
   head -n 4 version.xml >> build/version.xml
@@ -33,11 +33,11 @@ do_compile() {
 
   # move classes into jar archive
   # jar -> fastjar
-  ${STAGING_BINDIR}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
+  ${STAGING_BINDIR_NATIVE}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
   
   # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
   # javah -> kaffeh
-  ${STAGING_BINDIR}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
+  ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
 
   # Native language (C) library - libavetanaBT.so
   ${CXX} ${CXXFLAGS}  -shared -lbluetooth -I${STAGING_INCDIR}/classpath c/BlueZ.cpp -o libavetanaBT.so ${LDFLAGS}
index b0deab2a424759133293dd4d14ea62acf49c90f5..66ee81d99a5573b6574bec71e99a9356a0977f03 100644 (file)
@@ -26,8 +26,8 @@ do_compile() {
 
   # generate classes
   # javac -> jikes
-  ${STAGING_BINDIR}/find {de,javax,com} -iname *.java > file.list
-  ${STAGING_BINDIR}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+  ${STAGING_BINDIR_NATIVE}/find {de,javax,com} -iname *.java > file.list
+  ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
 
   # create own version.xml (add version information available at runtime)
   head -n 4 version.xml >> build/version.xml
@@ -36,11 +36,11 @@ do_compile() {
 
   # move classes into jar archive
   # jar -> fastjar
-  ${STAGING_BINDIR}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
+  ${STAGING_BINDIR_NATIVE}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
   
   # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
   # javah -> kaffeh
-  ${STAGING_BINDIR}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
+  ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
 
   # Native language (C) library - libavetanaBT.so
   ${CXX} ${CXXFLAGS}  -shared -lbluetooth -I${STAGING_INCDIR}/classpath c/BlueZ.cpp -o libavetanaBT.so ${LDFLAGS}
index 13d03a1705d5933322bcfa78d7aabfe93bf7f5a3..6c41497ef49367c63caae1fa0b34dbf6b33739b7 100644 (file)
@@ -8,7 +8,7 @@ PR = "r1"
 SRC_URI = "http://www.clearsilver.net/downloads/${P}.tar.gz \
            file://crosscompile.patch;patch=1"
 
-EXTRA_OECONF = "--disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp --enable-gettext --with-python=${STAGING_BINDIR}/python"
+EXTRA_OECONF = "--disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp --enable-gettext --with-python=${STAGING_BINDIR_NATIVE}/python"
 
 inherit autotools
 
index 0b93e94a7bfe93335173293988e3e6253f8f54cd..7230f985f6537a6f0bc281d30cf4d4117ff7b16a 100644 (file)
@@ -11,10 +11,10 @@ LD_SO = "lib/ld-linux.so.2"
 do_stage() {
        install -d ${STAGING_DATADIR}/dejagnu/baseboards
        install -m 0644 ${WORKDIR}/arm-qemu.exp ${STAGING_DATADIR}/dejagnu/baseboards/
-       cat <<EOF >${STAGING_BINDIR}/${QEMU}-test-wrapper
+       cat <<EOF >${STAGING_BINDIR_NATIVE}/${QEMU}-test-wrapper
 #!/bin/sh
 exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR}/${TARGET_SYS}/lib \$1
 EOF
-       chmod 755 ${STAGING_BINDIR}/arm-qemu-test-wrapper
+       chmod 755 ${STAGING_BINDIR_NATIVE}/arm-qemu-test-wrapper
 }
 
index 355d910d3fca8c642be7ccd9fe4b2bf652315fda..81233ed28cc1ecf32cd4dd595994e66dc02e4064 100644 (file)
@@ -18,7 +18,7 @@ inherit autotools pkgconfig
 
 FILES_${PN} += " /usr/lib/dillo/ /usr/bin/dpid /usr/bin/dpidc "
 
-export PNG_CONFIG = "${STAGING_BINDIR}/libpng-config"
+export PNG_CONFIG = "${STAGING_BINDIR_CROSS}/libpng-config"
 
 EXTRA_OECONF = "--disable-dlgui"
 
index 333f2406e1157befddafaab70aae736a6be6f5ec..de639bfd3f20b429b40b92cbb29a82656336e2ad 100644 (file)
@@ -8,6 +8,6 @@ inherit e
 SRC_URI = "${E_CVS};module=e17/apps/iconbar;date=${PV}"
 S = "${WORKDIR}/iconbar"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
index 78c1c1aa26016b70e821576dcfda811d4b86b864..3084fd99bc48e449a39feca4fc160ae7e71aaf63 100644 (file)
@@ -19,7 +19,7 @@ PROFILE_spitz = "HIRES_PDA"
 PROFILE_akita = "HIRES_PDA"
 
 EXTRA_OECONF = "--with-profile=${PROFILE} \
-                --with-edje-cc=${STAGING_BINDIR}/edje_cc \
+                --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
                 --x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR}"
 
index 36cf7c02ad263ae2c390dd04a7250bb9e0c2c8af..d78e1322c2658b3c8997c26bb0d74036f872cd20 100644 (file)
@@ -8,7 +8,7 @@ inherit e
 SRC_URI = "${E_CVS};module=e17/apps/eclair;date=${PV}"
 S = "${WORKDIR}/eclair"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
index d181d57ffd2ec02a88fe503ed3600856f62f6cc1..ee71e1a0bbe0167b04ad3c6025454b53435ce054 100644 (file)
@@ -9,7 +9,7 @@ SRC_URI = "${E_CVS};module=misc/engage;date=${PV} \
            file://no-local-includes.patch;patch=1"
 S = "${WORKDIR}/engage"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
index 48c37c72a2e21305ac7950a6418faced318950ac..776f652b960614261937776c1a7d46f9595a999e 100644 (file)
@@ -11,7 +11,7 @@ RDEPENDS += "libesmart-container-plugins libesmart-thumb0 libesmart-trans-x11-0
 SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}"
 S = "${WORKDIR}/entice"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
index 25b50467a4f512c2760db080203cc6c23fd0d1c4..87434e3d3bcd1c1b70ca41df56d67e8e9e1f7966 100644 (file)
@@ -11,7 +11,7 @@ RDEPENDS += "libesmart-container-plugins libesmart-thumb libesmart-trans-x11-0 l
 SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}"
 S = "${WORKDIR}/entice"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
index 5d065ea36d3bda7fe42443832f7e1bece40662fe..9f15c72282ab2681461be771c88193e039f8e4dd 100644 (file)
@@ -20,7 +20,7 @@ SRC_URI = "${E_URI}/entrance-${PV}.tar.gz \
 
 S = "${WORKDIR}/entrance-${PV}"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
                 --with-xsession=/etc/X11/Xsession \
                 --with-auth-mode=0"
 
index e689eb17125a690625e9c42976131873043bcb48..b406ea3b5fc8eeedd3c8b30b8ed49770ce9e7755 100644 (file)
@@ -8,6 +8,6 @@ inherit e
 SRC_URI = "${E_CVS};module=e17/apps/examine;date=${PV}"
 S = "${WORKDIR}/examine"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
index cacd461a177a6182b04d014d2d0fb431dc70ac71..52cb799cf2f3177f788a26be2338238e17377379 100644 (file)
@@ -4,7 +4,7 @@ DESCRIPTION = "GNOME configuration database system"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
           file://backends.patch;patch=1"
 DEPENDS = "orbit2 glib-2.0  libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += " ${libdir}/GConf/*"
 
index 29f67234869c36fe5f62797d1009b07555e0765c..1c11f9841f9bb73632d0a605936e033c5ec4a1dd 100644 (file)
@@ -8,7 +8,7 @@ RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
 
 SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
 
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += " ${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so ${libdir}/vfs"
 FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include ${libdir}/bonobo/monikers/*.a ${libdir}/bonobo/monikers/*.la"
index 14e8d11fc54eeddd080f2aa8e53cef3355a7ba4f..c967c746d1f9dfd37faf26284d9d20614015727c 100644 (file)
@@ -8,7 +8,7 @@ RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 
 SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
 
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += " ${libdir}/gnome-vfs-2.0/modules/*.so ${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so ${libdir}/vfs"
 FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include ${libdir}/bonobo/monikers/*.a ${libdir}/bonobo/monikers/*.la"
index 65973ab5f67fee4aebc9a7eec8bf47c7e8d5c1d9..e9a903f5983b9ee52a73a647f996dd9043728142 100644 (file)
@@ -8,7 +8,7 @@ RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 
 SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
 
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += " ${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so ${libdir}/vfs"
 FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include ${libdir}/bonobo/monikers/*.a ${libdir}/bonobo/monikers/*.la"
index bd51d4e45ae7d1e6d8536eb0562ef220d2304eb9..91e81f98ba5685e416e18a5b9b31b23d3dd3efeb 100644 (file)
@@ -6,7 +6,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-${PV}
            file://gtk-doc.m4 \
            file://gtk-doc.make"
 DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
 FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
index d3cdc3a1c88f2dc602e5bc6776aaf038581313a3..0399b8b6c0522286d8c87350abb9fefecf509065 100644 (file)
@@ -9,7 +9,7 @@ SRC_URI += "file://configure-gthread.patch;patch=1 \
             file://gtk-doc.m4 \
             file://gtk-doc.make"
 DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
 FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
index 4af46fa444a66a6fb9b97ad49d537b824070809e..d08b6bafd19861d1e955948f79c09e4c5021fbc4 100644 (file)
@@ -5,7 +5,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.
            file://gtk-doc.m4 \
            file://gtk-doc.make"
 DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 inherit autotools pkgconfig
 
index f2374b953f83159c9c30ea2160525cb359daec72..2eee5fd6d8d58566536097c13353f833dd8fee40 100644 (file)
@@ -6,7 +6,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.
            file://gtk-doc.m4 \
            file://gtk-doc.make"
 DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
 FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
index 83d6f0ec1526169a9c638d6daf4a2d1800983645..4ac4129414faa350365dbffbcf5d8aaa493f2197 100644 (file)
@@ -15,7 +15,7 @@ S = "${WORKDIR}/ORBit2-${PV}"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gtk-doc"
-EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'"
+EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
 
 do_configure_prepend() {
        mkdir -p m4
@@ -24,7 +24,7 @@ do_configure_prepend() {
 }
 
 do_compile_append () {
-       sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
+       sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
        mv ORBit-2.0.pc.new ORBit-2.0.pc
 }
 
index d196829add876846ada35726951a90e65f6f008c..e4d83408b12ee2590cac2cf647699a447d6155cb 100644 (file)
@@ -15,7 +15,7 @@ S = "${WORKDIR}/ORBit2-${PV}"
 inherit autotools pkgconfig
 PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-gtk-doc"
-EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'"
+EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
 
 do_configure_prepend() {
        mkdir -p m4
@@ -24,7 +24,7 @@ do_configure_prepend() {
 }
 
 do_compile_append () {
-       sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
+       sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
        mv ORBit-2.0.pc.new ORBit-2.0.pc
 }
 
index 44bc402c05bce877d2b34c3aa2334cb36e91d3a0..5ce381f0ad7391f5a6856e5d0c95310821f34725 100644 (file)
@@ -16,7 +16,7 @@ S = "${WORKDIR}/ORBit2-${PV}"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gtk-doc"
-EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'"
+EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
 
 do_configure_prepend() {
        mkdir -p m4
@@ -25,7 +25,7 @@ do_configure_prepend() {
 }
 
 do_compile_append () {
-       sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
+       sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
        mv ORBit-2.0.pc.new ORBit-2.0.pc
 }
 
index fb782ecb0b7af4e926a427df374a5b1511fc0d40..170c251aaff7f8d388147c88b47b11cec37683ed 100644 (file)
@@ -12,7 +12,7 @@ inherit autotools
 
 PARALLEL_MAKE = ""
 
-EXTRA_OEMAKE = "SOAP=${STAGING_BINDIR}/soapcpp2"
+EXTRA_OEMAKE = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2"
 
 do_install_append() {
        install -d ${D}${libdir}
index 56b3c0849ad6818f60b07e10f4fc07b64e27cc00..8025beb75c1187e1e3a728193ab585440807087d 100644 (file)
@@ -48,7 +48,7 @@ do_stage () {
        mkdir -p ${STAGING_LIBDIR}/gtk-1.2/include
 
        install -m 0644 gtk.m4 ${STAGING_DATADIR}/aclocal/
-       install -m 0755 gtk-config ${STAGING_BINDIR}
+       install -m 0755 gtk-config ${STAGING_BINDIR_CROSS}
 }
 
 do_install_append () {
index aaa4b3301c204fd0ec4115dcbadb218e33742476..33b0423e254846e886db3d9a7e90f9da863b1cea 100644 (file)
@@ -21,5 +21,5 @@ do_stage() {
 }
 
 do_compile() {
-       oe_runmake ORBIT_IDL=${STAGING_BINDIR}/orbit-idl-2
+       oe_runmake ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2
 }
index 165b2ff5f4fc2d2983be21063d6e77e2cbf1b3d9..d27f72ae4ad7787e294c1fd43d1b6d5a5a5c9ff1 100644 (file)
@@ -21,5 +21,5 @@ do_stage() {
 }
 
 do_compile() {
-       oe_runmake ORBIT_IDL=${STAGING_BINDIR}/orbit-idl-2
+       oe_runmake ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2
 }
index c3687b70ccb1936d37ecea7837ee16f5e1de9e51..7af6879042b0b7899f4f20e62c1ad0431abe4984 100644 (file)
@@ -20,5 +20,5 @@ do_stage() {
 }
 
 do_compile() {
-       oe_runmake ORBIT_IDL=${STAGING_BINDIR}/orbit-idl-2
+       oe_runmake ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2
 }
index 27742e0670116746e434f5275e660f5750068882..45a74e60a7f2917cebdb6bb5233650968d4ad6b9 100644 (file)
@@ -27,7 +27,7 @@ S = "${WORKDIR}/ion-3ds-${SNAPDATE}"
 
 EXTRA_OECONF += "--disable-xinerama --disable-xfree86-textprop-bug-workaround \
                 --disable-Xutf8 --disable-sun-fix-remap --enable-shared \
-                --with-lua-prefix=${STAGING_BINDIR}/.. \
+                --with-lua-prefix=${STAGING_BINDIR_NATIVE}/.. \
                 --x-libraries=${STAGING_LIBDIR} \
                 --x-includes=${STAGING_INCDIR}"
 
index 94188bedee57cbbcd6b0b21668cefc4bca865e4e..3370ad0c81d6f4c0e96a87113adb53ea1745ec2e 100644 (file)
@@ -13,11 +13,11 @@ FILES_${PN} = "${base_libdir}/firmware/NPE-B"
 do_compile() {
 #        if test '${ARCH_BYTE_SEX}' = be
 #        then
-               ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -be
+               ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be
 #        fi
 #        if test '${ARCH_BYTE_SEX}' = le
 #        then
-#                ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le
+#                ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -le
 #        fi
 }
 
index b6a47177cb17bb9b1d1f87e91bde01e630d9e71b..571080bda0ddcd73605e9b54538e9de936b04e2c 100644 (file)
@@ -13,11 +13,11 @@ FILES_${PN} = "${base_libdir}/firmware/NPE-B"
 do_compile() {
 #        if test '${ARCH_BYTE_SEX}' = be
 #        then
-               ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -be
+               ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be
 #        fi
 #        if test '${ARCH_BYTE_SEX}' = le
 #        then
-#                ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le
+#                ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -le
 #        fi
 }
 
index 342197c8ada292bda05c37ed265c531daf3d9dd4..978ae10be5d3477a547754698fd7752ec78d2a89 100644 (file)
@@ -16,7 +16,7 @@ S = "${WORKDIR}/jpeg-${PV}"
 inherit autotools 
 
 EXTRA_OECONF="--enable-static --enable-shared"
-EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"'
+EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"'
 
 CFLAGS_append = " -D_REENTRANT"
 
index bd5d2968f66dad1c1d69d2342c67260558278641..8edecdc868f319b18f896db8a0d3f525f00fcc7a 100644 (file)
@@ -9,7 +9,7 @@ require kaffe.inc
 DEPENDS += "libqpe-opie"
 
 CXXFLAGS += " -DQPE "
-EXTRA_OEMAKE += "MOC=${STAGING_BINDIR}/moc"
+EXTRA_OEMAKE += "MOC=${STAGING_BINDIR_NATIVE}/moc"
 EXTRA_OECONF += " --with-qtdir=$QTDIR \
        --with-awt=qt \
        --enable-pure-java-math \
index 39229f7a9bc29d48d6f002edc187553e6a8feab4..4cfd685f431c75d3a65064e27bcae35c9ded0255 100755 (executable)
@@ -9,7 +9,7 @@ SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \
 
 inherit autotools pkgconfig
 
-export PKG_CONFIG="${STAGING_BINDIR}/pkg-config"
+export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config"
 
 EXTRA_OECONF = "--disable-binreloc"
 
index 690df1acfac6df97850c6125a654c560c3a9480b..4cc1f8d4fe913ee253b5b57ad26d2db3b3497a11 100644 (file)
@@ -28,9 +28,9 @@ inherit autotools
 
 FILES_${PN} = "${palmtopdir}"
 
-export QMAKE = "${STAGING_BINDIR}/qmake"
-export MOC = "${STAGING_BINDIR}/moc"
-export UIC = "${STAGING_BINDIR}/uic"
+export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
+export MOC = "${STAGING_BINDIR_NATIVE}/moc"
+export UIC = "${STAGING_BINDIR_NATIVE}/uic"
 export exec_prefix = "${STAGING_LIBDIR}/.."
 
 EXTRA_OECONF = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir}                              \
index 221ecb0bb30eec52f71dfd255610ebe0957438dd..0b7e0aff8b0849a8184cc80e9844f8d52a072431 100644 (file)
@@ -18,9 +18,9 @@ SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.1;module=kdelibs;date=${P
 #          file://inject-extraflags.patch;patch=1"
 S = "${WORKDIR}/kdenox"
 
-export QMAKE = "${STAGING_BINDIR}/qmake"
-export MOC = "${STAGING_BINDIR}/moc"
-export UIC = "${STAGING_BINDIR}/uic"
+export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
+export MOC = "${STAGING_BINDIR_NATIVE}/moc"
+export UIC = "${STAGING_BINDIR_NATIVE}/uic"
 export exec_prefix = "${palmtopdir}"
 export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS"
 export PCRE_CONFIG = "invalid"
index fe1024afa8b96242f318ff2a795adc29fed122e8..6eb3249821659bf1c76390c18a62a0e2c378aa90 100644 (file)
@@ -11,7 +11,7 @@ S = "${WORKDIR}/kphone_pi"
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/kppi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/kppi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
 QMAKE_PROFILES= "kphone_piE.pro"
 
 do_configure_prepend() {
index 7724a3605f95fbf3bff5772bb40ee197fe37bdcc..d022dc55cc85efc1c63866270e57ebad1e9f2077 100644 (file)
@@ -11,7 +11,7 @@ S = "${WORKDIR}/ktimetracker_pi"
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/ktpi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/ktpi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
 QMAKE_PROFILES= "ktimetracker_piE.pro"
 
 do_configure_prepend() {
index 49becccbd3a57e125a58ad464b4bc6b2bb97cfe5..496a80904ec928190d9c5a2a1ee30d390cb1c8ed 100644 (file)
@@ -7,7 +7,7 @@ PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lgames/lbreakout2-2.6beta.tar.gz"
 
-export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config"
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
 inherit autotools
 
index c4259eb0f3ec2885eec9cd375f225e54845ed73e..0eaeaaf9fc6f86b0aa2848c5a07a706af1616361 100644 (file)
@@ -22,7 +22,7 @@ EXTRA_OECONF = "--without-pth"
 do_stage() {
        oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
        oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-       install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+       install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
        install -d ${STAGING_INCDIR}/
        for X in gcrypt.h gcrypt-module.h
index d961e4f84a28bb6fe6012fc2c873410f25944cb8..be0ad787da24ae8f892ca75a6175f121928914fd 100644 (file)
@@ -18,7 +18,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_stage() {
        oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
        oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-       install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+       install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
        install -d ${STAGING_INCDIR}/
        for X in gcrypt.h gcrypt-module.h
index e797ee75c72ccd249b6c9f360af1f06bf56b3a28..3f4942cae5ea1447f9b5c78dd42959f7292dcae7 100644 (file)
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_stage() {
        oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
        oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-       install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+       install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
        install -d ${STAGING_INCDIR}/
        for X in gcrypt.h gcrypt-module.h
index e797ee75c72ccd249b6c9f360af1f06bf56b3a28..3f4942cae5ea1447f9b5c78dd42959f7292dcae7 100644 (file)
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_stage() {
        oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
        oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-       install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+       install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
        install -d ${STAGING_INCDIR}/
        for X in gcrypt.h gcrypt-module.h
index e797ee75c72ccd249b6c9f360af1f06bf56b3a28..3f4942cae5ea1447f9b5c78dd42959f7292dcae7 100644 (file)
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_stage() {
        oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
        oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-       install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+       install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
        install -d ${STAGING_INCDIR}/
        for X in gcrypt.h gcrypt-module.h
index fced6b7adc39b66c51b75c1a37c088c023e821ed..4929121167180ac6cef59866260eafeeaa3d963a 100644 (file)
@@ -10,7 +10,8 @@ inherit autotools binconfig
 
 do_stage() {
        oe_libinstall -so -C src libgpg-error ${STAGING_LIBDIR}
-       install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
+       install -d ${STAGING_BINDIR_CROSS}/
+       install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/
 
        install -d ${STAGING_INCDIR}/
        for X in gpg-error.h
index c165044e834b245089014e4e5d481ceecb6bee59..7edea97fe1433689f5c54205b5371af1ef9f2512 100644 (file)
@@ -15,7 +15,8 @@ inherit autotools binconfig pkgconfig
 
 do_stage() {
        oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR}
-       install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
+       install -d ${STAGING_BINDIR_CROSS}/
+       install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/
 
        install -d ${STAGING_INCDIR}/
        for X in gpg-error.h
index a2a19b254cde1ed7756a8d1d8df971c94781070d..e520a23ae017d9f079f2f1e3ff838d94499cb0ae 100644 (file)
@@ -15,7 +15,8 @@ inherit autotools binconfig pkgconfig
 
 do_stage() {
        oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR}
-       install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
+       install -d ${STAGING_BINDIR_CROSS}/
+       install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/
 
        install -d ${STAGING_INCDIR}/
        for X in gpg-error.h
index a2a19b254cde1ed7756a8d1d8df971c94781070d..e520a23ae017d9f079f2f1e3ff838d94499cb0ae 100644 (file)
@@ -15,7 +15,8 @@ inherit autotools binconfig pkgconfig
 
 do_stage() {
        oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR}
-       install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
+       install -d ${STAGING_BINDIR_CROSS}/
+       install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/
 
        install -d ${STAGING_INCDIR}/
        for X in gpg-error.h
index 47128165b11427e628cdf65a83eab05627fcb6d2..ad3f895db837c26b61892855358faeb84dadb68e 100644 (file)
@@ -16,9 +16,10 @@ do_stage() {
        oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR}
        install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/
 
+       install -d ${STAGING_BINDIR_CROSS}
         cat libmikmod-config | sed 's,$libdir , ,' \
-                             | sed 's,$includes , ,' > ${STAGING_BINDIR}/libmikmod-config
-        chmod a+rx ${STAGING_BINDIR}/libmikmod-config
+                             | sed 's,$includes , ,' > ${STAGING_BINDIR_CROSS}/libmikmod-config
+        chmod a+rx ${STAGING_BINDIR_CROSS}/libmikmod-config
        install -d ${STAGING_DATADIR}/aclocal/
        install -m 0644 libmikmod.m4 ${STAGING_DATADIR}/aclocal/
 }
index 071a53e0cde7e66e0d225254f8f219cfe4b2b13f..6e6067cf8f939accdcb0ffdef5655d3584f5de0c 100644 (file)
@@ -27,7 +27,7 @@ do_configure() {
 }
 
 do_stage() {
-       install -m 0755 libnet-config ${STAGING_BINDIR}/
+       install -m 0755 libnet-config ${STAGING_BINDIR_CROSS}/
        install -m 0644 include/libnet.h ${STAGING_INCDIR}/
        install -d ${STAGING_INCDIR}/libnet
        install -m 0644 include/libnet/libnet-headers.h ${STAGING_INCDIR}/libnet/
index 1f11d8371cd93b1ab3334ee2172ee9bdac04016e..18bc4aa66ef60b06fd60ae6ff426cb3675d23c74 100644 (file)
@@ -7,7 +7,7 @@ inherit autotools
 
 do_stage() {
        install -d ${STAGING_INCDIR}/libol
-       install -m 0755 ${S}/libol-config ${STAGING_BINDIR}
+       install -m 0755 ${S}/libol-config ${STAGING_BINDIR_CROSS}
        install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}
        ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
        install ${S}/src/*.h ${STAGING_INCDIR}/libol/
index dae22db04e392c713077a3b2131102eba66d83b5..3ddaaa62a3856a9b8bc95bd15ed9211273f2923b 100644 (file)
@@ -8,7 +8,7 @@ inherit autotools
 
 do_stage() {
         install -d ${STAGING_INCDIR}/libol
-        install -m 0755 ${S}/libol-config ${STAGING_BINDIR}
+        install -m 0755 ${S}/libol-config ${STAGING_BINDIR_CROSS}
         install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}
         ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
         install ${S}/src/*.h ${STAGING_INCDIR}/libol/
index 9f488f346da955f7904c43810fc6596e84421688..17ac4e260523c05c055bee2a53d8c1f2628fd982 100644 (file)
@@ -51,7 +51,7 @@ do_compile() {
                install -m 0644 opiepim/private/$header ${STAGING_INCDIR}/opie2/private/
        done
 
-       oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
+       oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic DESTDIR=${S}
 }
 
 do_stage() {
index 832aff7cd00bbbe60a28cf92972cfb7f4c2dd2a7..342c7d643bd07059a01fcba02d5a89ce0e3b58e1 100644 (file)
@@ -44,7 +44,7 @@ do_compile() {
                install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
        done
        rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
-       oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic
+       oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic
 }
 
 do_stage() {
index 258df26a15df74bb69623939c579ff2c46d41fc1..f8721678cf5ec196c955c8ad8bfc57decf955d8b 100644 (file)
@@ -14,7 +14,7 @@ do_compile() {
        do
                install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
        done
-       oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
+       oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic DESTDIR=${S}
 }
 
 do_stage() {
index ffc1c6956f62c7d9414f630c5970ef71741b036c..f78d992806bbf4acb720a55455490519a78622aa 100644 (file)
@@ -8,7 +8,7 @@ PR = "r1"
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz"
 S = "${WORKDIR}/SDL_mixer-${PV}"
 
-export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config"
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
 inherit autotools
 
index 7b78d2ae5168a042a1d6eb18bfe4df288fc58fb7..270ac8f6e5d66b80eb82dc4b0fd35ea6ecaac3f2 100644 (file)
@@ -43,7 +43,7 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
        --disable-aalibtest \
        --with-x --x-includes=${STAGING_INCDIR}/X11 --x-libraries=${STAGING_LIBDIR}"
 
-export WAND_CONFIG="${STAGING_BINDIR}/Wand-config"
+export WAND_CONFIG="${STAGING_BINDIR_CROSS}/Wand-config"
 
 do_compile() {
        oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
index 601d7e9090917488322d62c8f503aacdd9127409..992310b5a8fa3d2c80ce22e82bac695d8497ba39 100644 (file)
@@ -7,5 +7,5 @@ do_svnpatch() {
        cp ${WORKDIR}/patches-${PV}/defconfig ${WORKDIR}/defconfig
        rm -rf ${S}/patches
        cd ${S} && ln -s ${WORKDIR}/patches-${PV} ${S}/patches
-       cd ${S} && rm -rf .pc && ${STAGING_BINDIR}/quilt push -av
+       cd ${S} && rm -rf .pc && ${STAGING_BINDIR_NATIVE}/quilt push -av
 }
index 77e936fa9b99fc222d27887c0448f9ad102f2563..317a9808527dd9ffa09078b87b75e379e3fa9f14 100644 (file)
@@ -23,7 +23,7 @@ python do_unpack() {
        local = bb.data.expand(bb.fetch.localpath(src_uri, localdata), localdata)
        # dont need any parameters for extraction, strip them off
        local = re.sub(';.*$', '', local)
-       bindir = bb.data.getVar('STAGING_BINDIR', localdata, 1)
+       bindir = bb.data.getVar('STAGING_BINDIR_NATIVE', localdata, 1)
        cmd = '%s/unzip %s' % (bindir, local)
        if not os.path.exists(bb.data.getVar('S', localdata, 1)):
                os.mkdir(bb.data.getVar('S', localdata, 1))
index 79f22e8562373494e224f99cfbe4adf59a79f7ee..527629d413e08e1380dcd82a4481cf80790c880d 100644 (file)
@@ -23,7 +23,7 @@ INITSCRIPT_PACKAGES = "mysql-server"
 INITSCRIPT_NAME = "mysqld"
 INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ."
 
-EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'"
+EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
 EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb "
 
 do_stage() {
index e9198eae89dee734c61279e458660f327992b4c3..db18ee3160e9abc7e513c682d27934921ad522b5 100644 (file)
@@ -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
 }
 
index d1e8bd50650178c803c6fae008df24dfbafb5ff8..84a47ff570dc503255cea13c45a73b9c0edfe159 100644 (file)
@@ -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 \
index 2530dc42115b22a22214a233c22742dac49d5455..ec710c45faefc73a4fef4633ff821d5e47edffed 100644 (file)
@@ -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 () {
index 80e975b5783a64bafdd34dc7f6f9f48896ee7ddf..0ef738a16a772719ad1a2320adf1a92b1d9ebab8 100644 (file)
@@ -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"
 
index a7286fef1b8b84cab77ab0c4a8e5670ce3068b58..4a0004fb555b226343dcfeed9a5307c2887112ba 100644 (file)
@@ -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'
 }
index aaa3a34c3660f57384301379a871d8a13e5d7de9..de4830cb643b95deb3d3ef3ab2829f1ff51504d2 100644 (file)
@@ -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"
index d475b227911a776a51ba0783031006f6405a4409..4909faaa1f079e86c3b3446ffe24672c8ebecf12 100644 (file)
@@ -19,7 +19,7 @@ inherit autotools pkgconfig
 
 do_compile () {
         export EmbeddedSystem=1
-        export TOOLBINDIR=${STAGING_BINDIR}
+        export TOOLBINDIR=${STAGING_BINDIR_NATIVE}
         oe_runmake
 }
 do_install () {
index 8c7064b3ce846a372313d81dabea0de3164d1125..4f42d78dedda26c4295d5f56e11cc5adc468930f 100644 (file)
@@ -14,10 +14,10 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
        file://config.sh-mipsel-linux \
        file://config.sh-i686-linux"
 
-HOSTPERL="${STAGING_BINDIR}/perl${PV}"
+HOSTPERL="${STAGING_BINDIR_NATIVE}/perl${PV}"
 
 do_configure() {
-       ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl 
+       ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl 
        cp ${HOSTPERL} hostperl
        cd Cross
        rm -f Makefile.SH.patch
index 35384e03f48ca311fd04f5b63144dbff980c3061..7e1ef2edf29aab679df471cb95aae9fa3aec31f6 100644 (file)
@@ -26,7 +26,7 @@ PARALLEL_MAKE = ""
 PR = "r21"
 
 do_configure() {
-       ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
+       ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl
        cp ${HOSTPERL} hostperl
        cd Cross
        rm -f Makefile.SH.patch
index da2e92852881dd6b8ba77a575bbf521ee0b7092c..6e2c26585a4deb148b359bb38c3aef152c137c0d 100644 (file)
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \
 
 EXTRA_OECONF += " --without-pear"
 # Uncomment the following two lines, and comment the above to enable PEAR
-#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php"
+#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php"
 #DEPENDS += " php-native"
 
 acpaths = ""
index da116fbf7f1be1afe94058a738b56f368364641d..025f112dcde41238f3d0e4936ccad279cf819e34 100644 (file)
@@ -22,7 +22,7 @@ EXTRA_OECONF = "--without-iconv \
 
 EXTRA_OECONF += " --without-pear"
 # Uncomment the following two lines, and comment the above to enable PEAR
-#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php"
+#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php"
 #DEPENDS += " php-native"
 
 acpaths = ""
index 97bc253aff1d5d5329638d7cc6138778d93bcf66..c64afeea03a8a2f5d369bba3cafc9862748410bb 100644 (file)
@@ -29,7 +29,7 @@ export SYSLIBS = "-lpcre -ldb ${LIBBDB_EXTRA} -lnsl -lresolv ${LDFLAGS}"
 export EXPORT = "AUXLIBS='-lpcre' CCARGS='-DHAS_PCRE ${CFLAGS}' OPT='' DEBUG='-g'"
 export CC_append = " -DHAS_PCRE ${CFLAGS}"
 export EXTRA_OEMAKE = "-e"
-export POSTCONF = "${STAGING_BINDIR}/postconf"
+export POSTCONF = "${STAGING_BINDIR_NATIVE}/postconf"
 
 do_compile () {
        unset CFLAGS CPPFLAGS CXXFLAGS
index f8ffcb7d011858a2aa6ec75ae994235a80711701..2c1d17dca820dc043c3c1a2207141d257bd25fca 100644 (file)
@@ -6,8 +6,8 @@ SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar
            file://game.png"
 
 do_compile_prepend = " \
-        export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; \
-       export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; "
+        export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \
+       export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; "
 
 FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps"
 FILES_${PN}-dbg += "${prefix}/games/.debug"
index e6d1ae2438c67363b23202abd0fa67e7d5fb97ef..d040299a0ee29222ecaac934ee0b95e505d9cd97 100644 (file)
@@ -23,7 +23,7 @@ do_configure_prepend() {
 do_stage() {
        autotools_stage_includes
         sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
-        install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/
+        install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
        install -d ${STAGING_DATADIR}/pygtk/2.0/codegen
        install -d ${STAGING_DATADIR}/pygtk/2.0/defs/
        cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/
index d1f65ea3ce8936daefab790d6e3439f725b6bb99..ab571bdfd9c13a4ea97f1910339b8c676881aa6c 100644 (file)
@@ -19,5 +19,5 @@ do_configure_prepend() {
 
 do_stage() {
        autotools_stage_includes
-       install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/
+       install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
 }
index fad858d20367bbdbb90d4373add4d8ea860eb246..64a9a71f6877a7f57716f311fc2752a1e98d11a0 100644 (file)
@@ -25,8 +25,8 @@ SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
 EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \
                          INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR}"
 
-#EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic \
-#                         QMAKE_MOC=${STAGING_BINDIR}/moc \
+#EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \
+#                         QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc \
 #                         QMAKE_RPATH=-Wl,-rpath-link, \
 #                         DESTDIR= \
 #                         VERSION=1.0.0 \
index 5e5f0b725640ee9fbedc1723d9dc2ac2a73f32b3..00d8f32fe36e48d6e4ef142cbdb905f8913c4260 100644 (file)
@@ -22,8 +22,8 @@ SIP_MODULES = "qt qtcanvas qttable qtpe"
 SIP_FEATURES = "${WORKDIR}/features"
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
-EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic \
-                         QMAKE_MOC=${STAGING_BINDIR}/moc \
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \
+                         QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc \
                          QMAKE_RPATH=-Wl,-rpath-link, \
                          DESTDIR= \
                          VERSION=1.0.0 \
index 44732d933aca7234d10cbde37dd7cf905acce760..dfa828bcd9200dd4aaadbf802d4eb86f12d63702 100644 (file)
@@ -39,8 +39,8 @@ do_compile_prepend() {
 }
 
 do_compile() {
-       oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \
-                  HOSTPYTHON=${STAGING_BINDIR}/python \
+       oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
+                  HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
                   STAGING_LIBDIR=${STAGING_LIBDIR} \
                   STAGING_INCDIR=${STAGING_INCDIR} \
                   BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
@@ -54,8 +54,8 @@ do_stage() {
 
 do_install() {
        install -m 0644 Makefile.orig Makefile
-        oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \
-                   HOSTPYTHON=${STAGING_BINDIR}/python \
+        oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
+                   HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
                    STAGING_LIBDIR=${STAGING_LIBDIR} \
                    STAGING_INCDIR=${STAGING_INCDIR} \
                   BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
index e6340da14ae2f1cf402770fb7615668fae3b745b..bd1c8e259830f276e66c9a7fb2c5e24ac284a6f5 100644 (file)
@@ -36,7 +36,7 @@ do_configure() {
 
 do_compile() {
        LD_LIBRARY_PATH=${S}/lib oe_runmake \
-               QMAKE="${STAGING_BINDIR}/qmake -after INCLUDEPATH+=${STAGING_INCDIR} LIBS+=-I${STAGING_LIBDIR}" \
+               QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCLUDEPATH+=${STAGING_INCDIR} LIBS+=-I${STAGING_LIBDIR}" \
                QMAKESPEC="${THIS_QMAKESPEC}"
 }
 
index f7acbec82f89ce8d438f6b35d4eec3dbd84af024..5a1c014e6d3307e250d67f7345757c693e769ef1 100644 (file)
@@ -23,11 +23,11 @@ EXTRA_OEMAKE = "-e"
 QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
                    -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose"
 
-EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \
              INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
              QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
              AR="${TARGET_PREFIX}ar cqs" \
-             MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"'
+             MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"'
 
 do_configure() {
        echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \
@@ -53,9 +53,9 @@ do_compile() {
 
 do_stage() {
        install -d ${STAGING_QT_DIR}/bin
-       ln -sf ${STAGING_BINDIR}/moc3 ${STAGING_QT_DIR}/bin/moc
-       ln -sf ${STAGING_BINDIR}/uic3 ${STAGING_QT_DIR}/bin/uic
-       ln -sf ${STAGING_BINDIR}/qmake ${STAGING_QT_DIR}/bin/qmake
+       ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc
+       ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic
+       ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake
        install -d ${STAGING_QT_DIR}/lib
        oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
        install -d ${STAGING_QT_DIR}/include/private
index 60f7f3fa666cb35a1d220fe5481632cd4e9b8492..dfefd444b762d5787c6ce9f4ad0af3c350a0eaeb 100644 (file)
@@ -1,4 +1,3 @@
-DESCRIPTION = "Qt/X11 Version ${PV}"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
@@ -49,17 +48,17 @@ QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-s
                    -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
                    -verbose -stl -no-accessibility"
 
-EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \
              INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
              QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
              AR="${TARGET_PREFIX}ar cqs" \
-             MOC="${STAGING_BINDIR}/moc4" UIC="${STAGING_BINDIR}/uic4" MAKE="make -e"'
+             MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
 
 do_configure() {
        echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri
        echo "DEFINES += QT_NO_XIM" >>src/qbase.pri
        unset QMAKESPEC
-       ln -sf ${STAGING_BINDIR}/qmake2 bin/qmake
+       ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
        ln -sf ./linux-g++ mkspecs/linux-gnueabi-g++
        #export QMAKESPEC="linux-oe-g++" 
        #rm -rf ./mkspecs
@@ -71,9 +70,9 @@ do_configure() {
 # FIXME: Might want to compile the cross tools for the -dev packages as well...
 do_compile() {
        unset CFLAGS CXXFLAGS
-       install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc
-       install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc
-       install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic
+       install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
+       install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
+       install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
 
        oe_runmake ${EXTRA_ENV}
 }
@@ -82,9 +81,9 @@ PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Svg Test Xml"
 
 do_stage() {
        oe_runmake install INSTALL_ROOT=/
-       install -m 0755 ${STAGING_BINDIR}/rcc4 ${STAGING_QT_DIR}/bin/rcc
-       install -m 0755 ${STAGING_BINDIR}/moc4 ${STAGING_QT_DIR}/bin/moc
-       install -m 0755 ${STAGING_BINDIR}/uic4 ${STAGING_QT_DIR}/bin/uic
+       install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
+       install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
+       install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
 
 }
 
index 27a1a45928fd0cd9361200dc3a02a886d57d4276..e22f211dc3b8ddb34c47a20bd311f9e79fc57a68 100644 (file)
@@ -140,16 +140,16 @@ export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -DNO_D
 #export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
 export SYSCONF_LFLAGS = "${LDFLAGS} -lts"
 export SYSCONF_LFLAGS_mnci = "${LDFLAGS}"
-export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
-export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
+export SYSCONF_MOC = "${STAGING_BINDIR_NATIVE}/moc"
+export SYSCONF_UIC = "${STAGING_BINDIR_NATIVE}/uic"
 
 do_configure_prepend_mnci() {
        chmod -R a+w ${S}/src/kernel
        cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel
        cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel
        mkdir bin
-       ln -sf ${STAGING_BINDIR}/moc bin/moc
-       ln -sf ${STAGING_BINDIR}/uic bin/uic
+       ln -sf ${STAGING_BINDIR_NATIVE}/moc bin/moc
+       ln -sf ${STAGING_BINDIR_NATIVE}/uic bin/uic
 }
 
 # generate uclibc and eabi configurations
index 9cd3be9d36f48f7db03e67f1fb124e4b547103c1..c28052df0c5d816d4d181aace48674d82f66edac 100644 (file)
@@ -20,7 +20,7 @@ EXTRA_OEMAKE = "-e"
 
 export CFLAG = "-DHAVE_ZLIB -DNO_DEBUG -finline-function"
 export CXXFLAGS = "-DHAVE_ZLIB -DNO_DEBUG -finline-function"
-export LIBS = "-L${STAGING_LIBDIR} -lz -lm -lX11 -lXext -lXau `${STAGING_BINDIR}/sdl-config --libs`"
+export LIBS = "-L${STAGING_LIBDIR} -lz -lm -lX11 -lXext -lXau `${STAGING_BINDIR_CROSS}/sdl-config --libs`"
 
 do_install() {
        install -d ${D}${bindir}
index 73d2f7db72c37186698295f95fd9efbc4cc199af..d268736df8ce39111ff923da407a20eee6aa02e4 100644 (file)
@@ -24,7 +24,7 @@ inherit distutils
 #
 do_compile() {
        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-         ${STAGING_BINDIR}/python setup.py build --executable=${bindir}/python || \
+         ${STAGING_BINDIR_NATIVE}/python setup.py build --executable=${bindir}/python || \
          oefatal "python setup.py build execution failed."
 }
 
@@ -36,6 +36,6 @@ do_compile() {
 #
 do_install() {
        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-         ${STAGING_BINDIR}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${prefix} || \
+         ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${prefix} || \
          oefatal "python setup.py install execution failed."
 }
index 6032ef08a33a551d2df626561621cb0257c06a8b..cd0dafcab84a160a482cdf8021bcd4a850190746 100644 (file)
@@ -11,8 +11,8 @@
  $(MTBFILES): msgcmp$(EXE) $(MTSSRC)
 -      ./msgcmp $(MTSSRC)
 -      ./rexx $(srcdir)/checkmts.rexx $(srcdir)
-+      $(STAGING_BINDIR)/msgcmp-multi-input $(MTSSRC)
-+      $(STAGING_BINDIR)/rexx $(srcdir)/checkmts.rexx $(srcdir)
++      $(STAGING_BINDIR_NATIVE)/msgcmp-multi-input $(MTSSRC)
++      $(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/checkmts.rexx $(srcdir)
  
  msgcmp$(EXE): msgcmp.$(OBJ)
        $(PURIFY) $(CC) $(LINKOPT) -o msgcmp$(EXE) msgcmp.$(OBJ)
        $(INSTALL) -m 644 -c ./es.mtb $(sharedir)/es.mtb
        $(INSTALL) -m 644 -c ./pl.mtb $(sharedir)/pl.mtb
 -      $(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/rexxcps.rexx  $(sharedir)/rexxcps.rexx
-+      $(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/rexxcps.rexx  $(sharedir)/rexxcps.rexx
++      $(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/rexxcps.rexx  $(sharedir)/rexxcps.rexx
        -chmod 755 $(sharedir)/rexxcps.rexx
 -      $(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/animal.rexx   $(sharedir)/animal.rexx
-+      $(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/animal.rexx   $(sharedir)/animal.rexx
++      $(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/animal.rexx   $(sharedir)/animal.rexx
        -chmod 755 $(sharedir)/animal.rexx
 -      $(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/block.rexx    $(sharedir)/block.rexx
-+      $(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/block.rexx    $(sharedir)/block.rexx
++      $(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/block.rexx    $(sharedir)/block.rexx
        -chmod 755 $(sharedir)/block.rexx
 -      $(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/dateconv.rexx $(sharedir)/dateconv.rexx
-+      $(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/dateconv.rexx $(sharedir)/dateconv.rexx
++      $(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/dateconv.rexx $(sharedir)/dateconv.rexx
        -chmod 755 $(sharedir)/dateconv.rexx
 -      $(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/timeconv.rexx $(sharedir)/timeconv.rexx
-+      $(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/timeconv.rexx $(sharedir)/timeconv.rexx
++      $(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/timeconv.rexx $(sharedir)/timeconv.rexx
        -chmod 755 $(sharedir)/timeconv.rexx
 -      $(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/newstr.rexx   $(sharedir)/newstr.rexx
-+      $(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/newstr.rexx   $(sharedir)/newstr.rexx
++      $(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/newstr.rexx   $(sharedir)/newstr.rexx
        -chmod 755 $(sharedir)/newstr.rexx
  
  installregina:
        $(INSTALL) -m 755 -c ./regina$(EXE) $(bindir)/regina$(EXE)
 -      $(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/regina $(srcdir)/demo/dynfunc.rexx  $(sharedir)/dynfunc.rexx
-+      $(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/regina $(srcdir)/demo/dynfunc.rexx  $(sharedir)/dynfunc.rexx
++      $(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/regina $(srcdir)/demo/dynfunc.rexx  $(sharedir)/dynfunc.rexx
        -chmod 755 $(sharedir)/dynfunc.rexx
  
  installlib: installregina
index 66adc5948a6bb9fbd80a9bc415b1ba8457bf5e6f..8634c7f89bfb70ce7d9602c6a6fb81e5ad706630 100644 (file)
@@ -19,13 +19,13 @@ do_configure() {
 }
 
 do_compile() {
-       oe_runmake STAGING_BINDIR="${STAGING_BINDIR}"
+       oe_runmake STAGING_BINDIR_NATIVE="${STAGING_BINDIR_NATIVE}"
 }
 
 do_install() {
        oe_runmake install bindir="${D}${bindir}" libdir="${D}${libdir}" includedir="${D}${includedir}" \
                            sharedir="${D}${datadir}" mandir="${D}${mandir}" sysconfdir="${D}${sysconfdir}" \
-                           STAGING_BINDIR="${STAGING_BINDIR}"
+                           STAGING_BINDIR_NATIVE="${STAGING_BINDIR_NATIVE}"
 }
 
 FILES_${PN} += "${datadir}"
index 5dfcf0db75a4af96db3ecfb18b3a1dc7ffcee967..a27670da76d0967fa1c26325f3eb160ee9738fa6 100644 (file)
@@ -9,7 +9,7 @@ SRC_URI = "http://thegraveyard.org/files/${PN}-${PV}.tar.bz2 \
            file://fix-makefile.patch;patch=1 \
            file://event_base.patch;patch=1"
 
-EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR}/${TARGET_SYS}' PKG_CONFIG='${STAGING_BINDIR}/pkg-config'"
+EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR}/${TARGET_SYS}' PKG_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config'"
 CFLAGS_append = " -I${STAGING_DIR}/${TARGET_SYS}/include/X11"
 LDFLAGS_append = " -L${STAGING_DIR}/${TARGET_SYS}/lib/X11"
 
index 8a5b18e1096b2e9e255dd3f346735ebaba6bdceb..e49ebb5549da7084353fa9f944afab60ff5840ed 100644 (file)
@@ -11,8 +11,8 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
 
 EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
                 --without-berkeley-db --without-apxs --without-apache \
-                --without-swig --with-apr=${STAGING_BINDIR} \
-                --with-apr-util=${STAGING_BINDIR}"
+                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+                --with-apr-util=${STAGING_BINDIR_CROSS}"
 
 inherit autotools
 
index be55366fd054d4f47120ff792089489b287f9ff4..ac0b821d35351f43f519e2bcd8f208f1ba1488b6 100644 (file)
@@ -12,8 +12,8 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
 
 EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
                 --without-berkeley-db --without-apxs --without-apache \
-                --without-swig --with-apr=${STAGING_BINDIR} \
-                --with-apr-util=${STAGING_BINDIR}"
+                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+                --with-apr-util=${STAGING_BINDIR_CROSS}"
 
 inherit autotools
 
index 2a8797634eba55b588b853991c557edc868e7e9e..59acb5767b6dcb274ea3f37bf17b7ddde4ca4844 100644 (file)
@@ -9,7 +9,7 @@ PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \
            http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;patch=1"
 
-export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config"
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
 inherit autotools 
 
index 10313fb4056537f3acc860d2e71a2540ebb555b6..74bbb633f1251a3766c4ec3f3a1bb61073bc8049 100644 (file)
@@ -8,7 +8,7 @@ S = "${WORKDIR}/SWIG-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-python=${STAGING_BINDIR} --with-swiglibdir=${STAGING_DIR}/${BUILD_SYS}/swig"
+EXTRA_OECONF = "--with-python=${STAGING_BINDIR_NATIVE} --with-swiglibdir=${STAGING_DIR}/${BUILD_SYS}/swig"
 
 do_configure() {
        oe_runconf
index a36c7b9934fd88f4771e285ce268b1e06dbb5c73..c8f595be0779e69c1614ab13beacc686c7130455 100644 (file)
@@ -8,7 +8,7 @@ S = "${WORKDIR}/swig-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-python=${STAGING_BINDIR} --with-swiglibdir=${STAGING_DIR}/${BUILD_SYS}/swig"
+EXTRA_OECONF = "--with-python=${STAGING_BINDIR_NATIVE} --with-swiglibdir=${STAGING_DIR}/${BUILD_SYS}/swig"
 
 do_configure() {
        oe_runconf
index 07e9ed14dffed7e39b47066e60ce29d3ff82b4c2..794ad5335ca24028d516f65c8f871177e7d4963d 100644 (file)
@@ -10,7 +10,7 @@ S = "${WORKDIR}/${PN}-${PV}"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF = "--with-libol=${STAGING_BINDIR}/"
+EXTRA_OECONF = "--with-libol=${STAGING_BINDIR_CROSS}/"
 
 do_install_append() {
         install -d ${D}/${sysconfdir}/${PN}
index af7a9b4502f061aa0e4a7d8e3f7a663a4e87bb25..d8e02d0da273fcbd18982953c43f0558bb38adbe 100644 (file)
@@ -9,7 +9,7 @@ SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz
 S = "${WORKDIR}/${PN}-${PV}"
 inherit autotools update-rc.d
 
-EXTRA_OECONF = "--with-libol=${STAGING_BINDIR}/"
+EXTRA_OECONF = "--with-libol=${STAGING_BINDIR_CROSS}/"
 CONFFILES_${PN} = "${sysconfdir}/${PN}/syslog-ng.conf"
 INITSCRIPT_NAME = "syslog-ng"
 INITSCRIPT_PARAMS = "defaults 05"
index f2eed3766714c300030c93ff89ea57f3e5c1d497..d6d6fe748724342357d778f2fea21eb5726bbd86 100644 (file)
@@ -27,7 +27,7 @@ do_stage() {
        oe_libinstall -a libtclstub8.4 ${STAGING_LIBDIR}
        oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR}
        sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
-       install -m 0755 tclConfig.sh ${STAGING_BINDIR}
+       install -m 0755 tclConfig.sh ${STAGING_BINDIR_CROSS}
        cd ..
        for dir in compat generic unix
        do
index e70db703e940c7741f7b653a1b32af3484a5235f..85b5124173db2e4920ec538b92f15cf52e6c724a 100644 (file)
@@ -15,7 +15,7 @@ S = "${WORKDIR}/tk${PV}/unix"
 
 inherit autotools
 
-EXTRA_OECONF = "--enable-threads --with-tcl=${STAGING_BINDIR} \
+EXTRA_OECONF = "--enable-threads --with-tcl=${STAGING_BINDIR_CROSS} \
                --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
 
 do_configure() {
@@ -27,7 +27,7 @@ do_stage() {
         oe_libinstall -a libtkstub8.4 ${STAGING_LIBDIR}
         oe_libinstall -so libtk8.4 ${STAGING_LIBDIR}
         sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tkConfig.sh
-        install -m 0755 tkConfig.sh ${STAGING_BINDIR}
+        install -m 0755 tkConfig.sh ${STAGING_BINDIR_CROSS}
        cd ..
        #for dir in compat generic unix
        #do
index ffdfae792a059df87dee6d9506429c81938dd419..f38bab7c102c023cad02bd3aa459928346ec1422 100644 (file)
@@ -43,8 +43,8 @@ do_configure() {
         find . -name libtool|xargs rm -f
         rm -rf ${S}/utils/texinfo/tools/info
         rm -rf ${S}/utils/texinfo/tools/makeinfo
-        ln -sf ${STAGING_BINDIR} ${S}/utils/texinfo/tools/info
-        ln -sf ${STAGING_BINDIR} ${S}/utils/texinfo/tools/makeinfo
+        ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/info
+        ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/makeinfo
         cat >${S}/utils/texinfo/tools/Makefile <<EOF
 install:
        echo "mickey _is_ cool - he tamed the tetex buildsystem"
@@ -54,7 +54,7 @@ EOF
 }
 # NOTE: Make sure it is using _our_ libtool and nothing else :/
 do_compile() {
-       LIBTOOL="${STAGING_BINDIR}/${HOST_SYS}-libtool" oe_runmake MAKE="${MAKE} LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"
+       LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool" oe_runmake MAKE="${MAKE} LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"
 }
 
 # NOTE: This is really ugly. Unfortunately the teTeX people seem not to know about PREFIX...
@@ -81,7 +81,7 @@ do_install() {
        web2cdir="${D}${datadir}" \
        kpathsea="${D}${libdir}/libkpathsea.la" \
        DESTDIR="" \
-       LIBTOOL="${STAGING_BINDIR}/${HOST_SYS}-libtool"
+       LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"
        MAKE="make -e" oe_runmake -e install
 }
 
index 23147a98c71912339d46d670a49d2bd2cc58749d..a0f7222904779dc7b56df4b968f320b722715980 100644 (file)
@@ -7,8 +7,9 @@ PRIORITY = "optional"
 
 S = "${WORKDIR}/tmake-${PV}"
 
+# Ick. This .bb file should really have a -native version doing this, even if it is a perl script... RP
 do_stage() {
-       install -m 0755 bin/tmake bin/progen ${STAGING_BINDIR}/
+       install -m 0755 bin/tmake bin/progen ${STAGING_BINDIR_NATIVE}/
 
        install -d ${STAGING_DATADIR}/tmake
        cp -R lib/* ${STAGING_DATADIR}/tmake/
index f0752aa6641962d2cc78e6adcd420d12be478691..6b87cf9c05d320a40a3d52c58e0d063fc7007a72 100644 (file)
@@ -29,7 +29,7 @@ do_compile () {
 }
 
 do_stage() {
-       install -m755 tools/mkimage ${STAGING_BINDIR}
+       install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
 }
 
 do_deploy () {
index 448dff38fa00278c61b7be3ed992ee34d09d2750..f5751db20406e893eb0c5a861c63779ed32e0348 100644 (file)
@@ -49,7 +49,7 @@ do_compile () {
 }
 
 do_stage() {
-       install -m755 tools/mkimage ${STAGING_BINDIR}
+       install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
 }
 
 do_deploy () {
index 5bf12bcaa0a1dc57886e7d3862972bacd57ec542..361d9c876bbe53a6a0a058eb9612560741d34dac 100644 (file)
@@ -35,7 +35,7 @@ do_compile () {
 }
 
 do_stage() {
-       install -m755 tools/mkimage ${STAGING_BINDIR}
+       install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
 }
 
 do_deploy () {
index 748d738c1c0a3bae45197bb0bcf2fe20d73704bf..d1a054f1b64ca1a62cbd76f83017a29ebaedd411 100644 (file)
@@ -28,7 +28,7 @@ do_stage() {
        cp -pR lib/wx     ${STAGING_LIBDIR}
        cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
        cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal            
-       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR}/wx-config
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config
        sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
            -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
            -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
index 05aeb6c08ee6102ee1c722612c2c5852663ea271..79dcc46b6e43af67c716b441c4b4872c8072d778 100644 (file)
@@ -29,7 +29,7 @@ do_stage() {
        cp -pR lib/wx     ${STAGING_LIBDIR}
        cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
        cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
-       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR}/wx-config
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR_CROSS}/wx-config
        sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
            -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
            -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
index 476b72c657fc5b64638af7dfab72d7e59e9a6a3f..f54dc1672038d7df012dfd5c3489986304d96d39 100644 (file)
@@ -7,7 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xmms-mad/xmms-mad-${PV}.tar.bz2"
 
 inherit autotools
 
-export XMMS_CONFIG = "${STAGING_BINDIR}/xmms-config"
+export XMMS_CONFIG = "${STAGING_BINDIR_CROSS}/xmms-config"
 
 FILES_${PN} = "${libdir}/xmms/Input/libxmmsmad.so"
 FILES_${PN}-dbg = "${libdir}/xmms/Input/.debug/libxmmsmad.so"
index 0c7a77e7f941f3f0939cdc4d5194250462fe0b85..d1b5f7ff0f8f92e0e3c8236eedaaed10713b8a44 100644 (file)
@@ -29,7 +29,7 @@ do_configure() {
        echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def
        echo "#define QtDir ${QTDIR}" >> config/cf/host.def
        echo "#define QtLibs -lqpe -lqte -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def
-       echo "#define MocBin ${STAGING_BINDIR}/moc" >> config/cf/host.def
+       echo "#define MocBin ${STAGING_BINDIR_NATIVE}/moc" >> config/cf/host.def
        echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX  QtCmnDefs" >> config/cf/host.def
        
        # Build these XServers
index cde82c3f4a5a79149d1c0b35db5934c4a7ad8532..ec6c6a176b2091c2da4d9fcea123ea0b1e726c8d 100644 (file)
@@ -45,7 +45,7 @@ do_configure() {
        echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def
        echo "#define QtDir ${QTDIR}" >> config/cf/host.def
        echo "#define QtLibs -lqpe -l${QT_LIBRARY} -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def
-       echo "#define MocBin ${STAGING_BINDIR}/moc" >> config/cf/host.def
+       echo "#define MocBin ${STAGING_BINDIR_NATIVE}/moc" >> config/cf/host.def
        echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX  QtCmnDefs" >> config/cf/host.def
        
        # Build these XServers
index 37e2dff71641eb6930f8268f366c0467679d65e9..efda9d2e6bab5d8afd065befd7bb7a64afe772e1 100644 (file)
@@ -10,7 +10,7 @@ SRC_URI = "http://zope.org/Products/Zope/${PV}/Zope-${PV}.tgz"
 S = "${WORKDIR}/Zope-${PV}-0"
 
 do_configure() {
-       ./configure --with-python=${STAGING_BINDIR}/python --prefix=${prefix} --optimize --ignore-zlib
+       ./configure --with-python=${STAGING_BINDIR_NATIVE}/python --prefix=${prefix} --optimize --ignore-zlib
 }
 
 do_compile() {
index e1409aed24c80a27a2df09e375cc40e559d748a7..12254375db1ae960073854d84770085c2a995f27 100644 (file)
@@ -10,7 +10,7 @@ SRC_URI = "http://zope.org/Products/Zope/${PV}/Zope-${PV}.tgz"
 S = "${WORKDIR}/Zope-${PV}"
 
 do_configure() {
-       ./configure --with-python=${STAGING_BINDIR}/python --prefix=${prefix} --force
+       ./configure --with-python=${STAGING_BINDIR_NATIVE}/python --prefix=${prefix} --force
 }
 
 do_compile() {