From 081432e434818a616a523f9f2bb18e707e4e68e3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 29 Nov 2006 11:34:04 +0000 Subject: Introduce STAGING_BINDIR_CROSS and STAGING_BINDIR_NATIVE as discussed on the mailing list. There should be no functionality changes yet. --- classes/ccdv.bbclass | 2 +- classes/distutils.bbclass | 4 ++-- classes/insane.bbclass | 2 +- classes/mozilla.bbclass | 6 +++--- classes/native.bbclass | 2 ++ classes/qmake-base.bbclass | 6 +++--- classes/qt3e.bbclass | 4 ++-- classes/qt3x11.bbclass | 4 ++-- classes/qt4x11.bbclass | 8 ++++---- classes/rubyextension.bbclass | 6 +++--- classes/scons.bbclass | 4 ++-- conf/bitbake.conf | 3 +++ packages/apmd/apmd_3.2.2.bb | 2 +- packages/apr/apr-util_0.9.12.bb | 2 +- packages/apr/apr-util_1.1.2.bb | 2 +- packages/apt/files/apt.conf | 2 +- packages/asterisk/asterisk-1.0.9/makefile.patch | 2 +- packages/asterisk/asterisk-1.2.8/makefile.patch | 2 +- packages/asterisk/asterisk_1.2.12.1.bb | 2 +- packages/asterisk/asterisk_1.2.13.bb | 2 +- packages/asterisk/asterisk_1.2.9.1.bb | 2 +- packages/avetanabt/avetanabt_20060413.bb | 8 ++++---- packages/avetanabt/avetanabt_cvs.bb | 8 ++++---- packages/clearsilver/clearsilver_0.10.3.bb | 2 +- packages/dejagnu/dejagnu-qemu_1.0.bb | 4 ++-- packages/dillo/dillo_0.8.6.bb | 2 +- packages/e17/e-iconbar_20060128.bb | 2 +- packages/e17/e-wm_0.16.999.036.bb | 2 +- packages/e17/eclair_20060128.bb | 2 +- packages/e17/engage_20060128.bb | 2 +- packages/e17/entice_20060128.bb | 2 +- packages/e17/entice_20060416.bb | 2 +- packages/e17/entrance_0.9.0.007.bb | 2 +- packages/e17/examine_20060128.bb | 2 +- packages/gnome/gconf_2.6.1.bb | 2 +- packages/gnome/gnome-vfs_2.12.0.bb | 2 +- packages/gnome/gnome-vfs_2.6.0.bb | 2 +- packages/gnome/gnome-vfs_2.6.2.bb | 2 +- packages/gnome/libbonobo_2.10.0.bb | 2 +- packages/gnome/libbonobo_2.14.0.bb | 2 +- packages/gnome/libbonobo_2.6.0.bb | 2 +- packages/gnome/libbonobo_2.6.2.bb | 2 +- packages/gnome/orbit2_2.10.2.bb | 4 ++-- packages/gnome/orbit2_2.13.2.bb | 4 ++-- packages/gnome/orbit2_2.14.0.bb | 4 ++-- packages/gsoap/gsoap_2.7.7.bb | 2 +- packages/gtk+/gtk+-1.2_1.2.10.bb | 2 +- packages/gtkhtml/gtkhtml-2.0_2.6.3.bb | 2 +- packages/gtkhtml/gtkhtml-3.0_3.0.10.bb | 2 +- packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb | 2 +- packages/ion/ion3_0.0+ds20041104.bb | 2 +- packages/ixp4xx/ixp4xx-npe_2.1.bb | 4 ++-- packages/ixp4xx/ixp4xx-npe_2.3.bb | 4 ++-- packages/jpeg/jpeg_6b.bb | 2 +- packages/kaffe/kaffe-qt_cvs.bb | 2 +- packages/kf/kf_0.5.4.1.bb | 2 +- packages/konqueror/konqueror-embedded_20030705.bb | 6 +++--- packages/konqueror/konqueror-embedded_20060404.bb | 6 +++--- packages/kphonepi/kphonepi_1.0.0.bb | 2 +- packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb | 2 +- packages/lbreakout/lbreakout2_2.6beta.bb | 2 +- packages/libgcrypt/libgcrypt_1.1.91.bb | 2 +- packages/libgcrypt/libgcrypt_1.2.0.bb | 2 +- packages/libgcrypt/libgcrypt_1.2.1.bb | 2 +- packages/libgcrypt/libgcrypt_1.2.2.bb | 2 +- packages/libgcrypt/libgcrypt_1.2.3.bb | 2 +- packages/libgpg-error/libgpg-error_0.6.bb | 3 ++- packages/libgpg-error/libgpg-error_0.7.bb | 3 ++- packages/libgpg-error/libgpg-error_1.0.bb | 3 ++- packages/libgpg-error/libgpg-error_1.3.bb | 3 ++- packages/libmikmod/libmikmod_3.1.11.bb | 5 +++-- packages/libnet/libnet_1.0.2a.bb | 2 +- packages/libol/libol_0.3.16.bb | 2 +- packages/libol/libol_0.3.18.bb | 2 +- packages/libopie/libopie2.inc | 2 +- packages/libqpe/libqpe-opie.inc | 2 +- packages/libqtaux/libqtaux2.inc | 2 +- packages/libsdl/libsdl-mixer_1.2.6.bb | 2 +- packages/libxine/libxine_1.1.0.bb | 2 +- packages/linux/ixp4xx-kernel-svnpatch.inc | 2 +- packages/misc-binary-only/tda1004x-firmware.bb | 2 +- packages/mysql/mysql_4.1.18.bb | 2 +- packages/nonworking/bogl/libbogl_0.1.9.bb | 4 ++-- packages/nonworking/e17/evidence | 2 +- packages/nonworking/lzma/lzma_0.01.bb | 2 +- packages/nonworking/qtella/qtella_0.6.5.bb | 2 +- packages/nonworking/r/r_2.0.0.bb | 2 +- packages/nonworking/zethereal/zethereal_1.0.0.bb | 2 +- packages/omniorb/omniorb_4.0.7.bb | 2 +- packages/perl/perl.inc | 4 ++-- packages/perl/perl_5.8.7.bb | 2 +- packages/php/php.inc | 2 +- packages/php/php_5.1.4.bb | 2 +- packages/postfix/postfix_2.0.20.bb | 2 +- packages/puzzles/puzzles_r6915.bb | 4 ++-- packages/python/python-pygtk2_2.10.3.bb | 2 +- packages/python/python-pygtk2_2.8.6.bb | 2 +- packages/python/python-pyqt4_4.0.bb | 4 ++-- packages/python/python-pyqt_3.13.bb | 4 ++-- packages/python/python_2.4.3.bb | 8 ++++---- packages/qt/qt-x11-free-native_3.3.5.bb | 2 +- packages/qt/qt-x11-free_3.3.6.bb | 10 +++++----- packages/qt/qt4-x11-free_4.1.2.bb | 19 +++++++++---------- packages/qte/qte-common_2.3.10.inc | 8 ++++---- packages/quake/quake1_0.0.1.bb | 2 +- packages/rdiff-backup/rdiff-backup.inc | 4 ++-- .../regina-rexx/files/use-proper-host-tools.patch | 18 +++++++++--------- packages/regina-rexx/regina-rexx_3.3.bb | 4 ++-- packages/skippy/skippy-xd_0.5.0.bb | 2 +- packages/subversion/subversion_1.3.1.bb | 4 ++-- packages/subversion/subversion_1.4.0.bb | 4 ++-- packages/supertux/supertux_0.1.2.bb | 2 +- packages/swig/swig_1.3.24.bb | 2 +- packages/swig/swig_1.3.29.bb | 2 +- packages/syslog-ng/syslog-ng_1.6.11.bb | 2 +- packages/syslog-ng/syslog-ng_1.6.8.bb | 2 +- packages/tcltk/tcl_8.4.11.bb | 2 +- packages/tcltk/tk_8.4.11.bb | 4 ++-- packages/tetex/tetex_3.0.bb | 8 ++++---- packages/tmake/tmake_1.11.bb | 3 ++- packages/uboot/u-boot_1.1.2.bb | 2 +- packages/uboot/u-boot_1.1.4.bb | 2 +- packages/uboot/u-boot_LABEL.2006.06.30.2020.bb | 2 +- packages/wxbase/wxbase_2.6.2.bb | 2 +- packages/wxbase/wxbase_2.7+cvs.bb | 2 +- packages/xmms/xmms-mad_0.10.bb | 2 +- packages/xqt/xqt_0.0.9.bb | 2 +- packages/xqt2/xqt2_20060509.bb | 2 +- packages/zope/zope_2.7.1.bb | 2 +- packages/zope/zope_2.9.2.bb | 2 +- 130 files changed, 208 insertions(+), 198 deletions(-) diff --git a/classes/ccdv.bbclass b/classes/ccdv.bbclass index a28ea672e5..8c8306cbf1 100644 --- a/classes/ccdv.bbclass +++ b/classes/ccdv.bbclass @@ -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: diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index a2b0e2b770..5f57a9ea19 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -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." } diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 4ff867b62f..e30375288d 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -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") diff --git a/classes/mozilla.bbclass b/classes/mozilla.bbclass index 3295c2b270..bd8e9193d9 100644 --- a/classes/mozilla.bbclass +++ b/classes/mozilla.bbclass @@ -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 ) diff --git a/classes/native.bbclass b/classes/native.bbclass index 04ff7d92d1..556c0e17e2 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -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}" diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass index 36ecfb622f..09694e97b8 100644 --- a/classes/qmake-base.bbclass +++ b/classes/qmake-base.bbclass @@ -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 diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass index c34d7c04f5..58a6779af6 100644 --- a/classes/qt3e.bbclass +++ b/classes/qt3e.bbclass @@ -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" diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 6e3d5f8ba2..24e824d06f 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -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" diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index 635fc67694..cb836cc362 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -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" diff --git a/classes/rubyextension.bbclass b/classes/rubyextension.bbclass index 9c9d66e260..628ebdb7c7 100644 --- a/classes/rubyextension.bbclass +++ b/classes/rubyextension.bbclass @@ -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." } diff --git a/classes/scons.bbclass b/classes/scons.bbclass index 3160eca69a..89b5da2d0e 100644 --- a/classes/scons.bbclass +++ b/classes/scons.bbclass @@ -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." } diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 92c7cef2dd..b06e2bb3d4 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -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" diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb index 4a23f39590..94541581d3 100644 --- a/packages/apmd/apmd_3.2.2.bb +++ b/packages/apmd/apmd_3.2.2.bb @@ -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() { diff --git a/packages/apr/apr-util_0.9.12.bb b/packages/apr/apr-util_0.9.12.bb index ba6e38241d..776fd03bfe 100644 --- a/packages/apr/apr-util_0.9.12.bb +++ b/packages/apr/apr-util_0.9.12.bb @@ -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 diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb index ad89228fff..ec1998d64b 100644 --- a/packages/apr/apr-util_1.1.2.bb +++ b/packages/apr/apr-util_1.1.2.bb @@ -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 diff --git a/packages/apt/files/apt.conf b/packages/apt/files/apt.conf index 37785871db..fc19018533 100644 --- a/packages/apt/files/apt.conf +++ b/packages/apt/files/apt.conf @@ -11,7 +11,7 @@ Dir "${STAGING_DIR}/" pkgcache ""; srcpkgcache ""; }; - Bin "${STAGING_BINDIR}/" + Bin "${STAGING_BINDIR_NATIVE}/" { methods "${STAGING_LIBDIR}/apt/methods/"; gzip "/bin/gzip"; diff --git a/packages/asterisk/asterisk-1.0.9/makefile.patch b/packages/asterisk/asterisk-1.0.9/makefile.patch index 066fb677dc..6684d8696e 100644 --- a/packages/asterisk/asterisk-1.0.9/makefile.patch +++ b/packages/asterisk/asterisk-1.0.9/makefile.patch @@ -208,7 +208,7 @@ # 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") diff --git a/packages/asterisk/asterisk-1.2.8/makefile.patch b/packages/asterisk/asterisk-1.2.8/makefile.patch index c786d09017..780868b91e 100644 --- a/packages/asterisk/asterisk-1.2.8/makefile.patch +++ b/packages/asterisk/asterisk-1.2.8/makefile.patch @@ -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 diff --git a/packages/asterisk/asterisk_1.2.12.1.bb b/packages/asterisk/asterisk_1.2.12.1.bb index c27963c9a0..c0b7fc2ed9 100644 --- a/packages/asterisk/asterisk_1.2.12.1.bb +++ b/packages/asterisk/asterisk_1.2.12.1.bb @@ -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" diff --git a/packages/asterisk/asterisk_1.2.13.bb b/packages/asterisk/asterisk_1.2.13.bb index 224b367de6..42a3214f0a 100644 --- a/packages/asterisk/asterisk_1.2.13.bb +++ b/packages/asterisk/asterisk_1.2.13.bb @@ -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" diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb index 00da4ab33f..c1cedf67f6 100644 --- a/packages/asterisk/asterisk_1.2.9.1.bb +++ b/packages/asterisk/asterisk_1.2.9.1.bb @@ -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" diff --git a/packages/avetanabt/avetanabt_20060413.bb b/packages/avetanabt/avetanabt_20060413.bb index b04a9e5552..5140b07874 100644 --- a/packages/avetanabt/avetanabt_20060413.bb +++ b/packages/avetanabt/avetanabt_20060413.bb @@ -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} diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb index b0deab2a42..66ee81d99a 100644 --- a/packages/avetanabt/avetanabt_cvs.bb +++ b/packages/avetanabt/avetanabt_cvs.bb @@ -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} diff --git a/packages/clearsilver/clearsilver_0.10.3.bb b/packages/clearsilver/clearsilver_0.10.3.bb index 13d03a1705..6c41497ef4 100644 --- a/packages/clearsilver/clearsilver_0.10.3.bb +++ b/packages/clearsilver/clearsilver_0.10.3.bb @@ -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 diff --git a/packages/dejagnu/dejagnu-qemu_1.0.bb b/packages/dejagnu/dejagnu-qemu_1.0.bb index 0b93e94a7b..7230f985f6 100644 --- a/packages/dejagnu/dejagnu-qemu_1.0.bb +++ b/packages/dejagnu/dejagnu-qemu_1.0.bb @@ -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 <${STAGING_BINDIR}/${QEMU}-test-wrapper + cat <${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 } diff --git a/packages/dillo/dillo_0.8.6.bb b/packages/dillo/dillo_0.8.6.bb index 355d910d3f..81233ed28c 100644 --- a/packages/dillo/dillo_0.8.6.bb +++ b/packages/dillo/dillo_0.8.6.bb @@ -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" diff --git a/packages/e17/e-iconbar_20060128.bb b/packages/e17/e-iconbar_20060128.bb index 333f2406e1..de639bfd3f 100644 --- a/packages/e17/e-iconbar_20060128.bb +++ b/packages/e17/e-iconbar_20060128.bb @@ -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}" diff --git a/packages/e17/e-wm_0.16.999.036.bb b/packages/e17/e-wm_0.16.999.036.bb index 78c1c1aa26..3084fd99bc 100644 --- a/packages/e17/e-wm_0.16.999.036.bb +++ b/packages/e17/e-wm_0.16.999.036.bb @@ -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}" diff --git a/packages/e17/eclair_20060128.bb b/packages/e17/eclair_20060128.bb index 36cf7c02ad..d78e1322c2 100644 --- a/packages/e17/eclair_20060128.bb +++ b/packages/e17/eclair_20060128.bb @@ -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}" diff --git a/packages/e17/engage_20060128.bb b/packages/e17/engage_20060128.bb index d181d57ffd..ee71e1a0bb 100644 --- a/packages/e17/engage_20060128.bb +++ b/packages/e17/engage_20060128.bb @@ -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}" diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb index 48c37c72a2..776f652b96 100644 --- a/packages/e17/entice_20060128.bb +++ b/packages/e17/entice_20060128.bb @@ -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}" diff --git a/packages/e17/entice_20060416.bb b/packages/e17/entice_20060416.bb index 25b50467a4..87434e3d3b 100644 --- a/packages/e17/entice_20060416.bb +++ b/packages/e17/entice_20060416.bb @@ -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}" diff --git a/packages/e17/entrance_0.9.0.007.bb b/packages/e17/entrance_0.9.0.007.bb index 5d065ea36d..9f15c72282 100644 --- a/packages/e17/entrance_0.9.0.007.bb +++ b/packages/e17/entrance_0.9.0.007.bb @@ -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" diff --git a/packages/e17/examine_20060128.bb b/packages/e17/examine_20060128.bb index e689eb1712..b406ea3b5f 100644 --- a/packages/e17/examine_20060128.bb +++ b/packages/e17/examine_20060128.bb @@ -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}" diff --git a/packages/gnome/gconf_2.6.1.bb b/packages/gnome/gconf_2.6.1.bb index cacd461a17..52cb799cf2 100644 --- a/packages/gnome/gconf_2.6.1.bb +++ b/packages/gnome/gconf_2.6.1.bb @@ -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/*" diff --git a/packages/gnome/gnome-vfs_2.12.0.bb b/packages/gnome/gnome-vfs_2.12.0.bb index 29f6723486..1c11f9841f 100644 --- a/packages/gnome/gnome-vfs_2.12.0.bb +++ b/packages/gnome/gnome-vfs_2.12.0.bb @@ -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" diff --git a/packages/gnome/gnome-vfs_2.6.0.bb b/packages/gnome/gnome-vfs_2.6.0.bb index 14e8d11fc5..c967c746d1 100644 --- a/packages/gnome/gnome-vfs_2.6.0.bb +++ b/packages/gnome/gnome-vfs_2.6.0.bb @@ -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" diff --git a/packages/gnome/gnome-vfs_2.6.2.bb b/packages/gnome/gnome-vfs_2.6.2.bb index 65973ab5f6..e9a903f598 100644 --- a/packages/gnome/gnome-vfs_2.6.2.bb +++ b/packages/gnome/gnome-vfs_2.6.2.bb @@ -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" diff --git a/packages/gnome/libbonobo_2.10.0.bb b/packages/gnome/libbonobo_2.10.0.bb index bd51d4e45a..91e81f98ba 100644 --- a/packages/gnome/libbonobo_2.10.0.bb +++ b/packages/gnome/libbonobo_2.10.0.bb @@ -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/* \ diff --git a/packages/gnome/libbonobo_2.14.0.bb b/packages/gnome/libbonobo_2.14.0.bb index d3cdc3a1c8..0399b8b6c0 100644 --- a/packages/gnome/libbonobo_2.14.0.bb +++ b/packages/gnome/libbonobo_2.14.0.bb @@ -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/* \ diff --git a/packages/gnome/libbonobo_2.6.0.bb b/packages/gnome/libbonobo_2.6.0.bb index 4af46fa444..d08b6bafd1 100644 --- a/packages/gnome/libbonobo_2.6.0.bb +++ b/packages/gnome/libbonobo_2.6.0.bb @@ -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 diff --git a/packages/gnome/libbonobo_2.6.2.bb b/packages/gnome/libbonobo_2.6.2.bb index f2374b953f..2eee5fd6d8 100644 --- a/packages/gnome/libbonobo_2.6.2.bb +++ b/packages/gnome/libbonobo_2.6.2.bb @@ -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/* \ diff --git a/packages/gnome/orbit2_2.10.2.bb b/packages/gnome/orbit2_2.10.2.bb index 83d6f0ec15..4ac4129414 100644 --- a/packages/gnome/orbit2_2.10.2.bb +++ b/packages/gnome/orbit2_2.10.2.bb @@ -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 } diff --git a/packages/gnome/orbit2_2.13.2.bb b/packages/gnome/orbit2_2.13.2.bb index d196829add..e4d83408b1 100644 --- a/packages/gnome/orbit2_2.13.2.bb +++ b/packages/gnome/orbit2_2.13.2.bb @@ -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 } diff --git a/packages/gnome/orbit2_2.14.0.bb b/packages/gnome/orbit2_2.14.0.bb index 44bc402c05..5ce381f0ad 100644 --- a/packages/gnome/orbit2_2.14.0.bb +++ b/packages/gnome/orbit2_2.14.0.bb @@ -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 } diff --git a/packages/gsoap/gsoap_2.7.7.bb b/packages/gsoap/gsoap_2.7.7.bb index fb782ecb0b..170c251aaf 100644 --- a/packages/gsoap/gsoap_2.7.7.bb +++ b/packages/gsoap/gsoap_2.7.7.bb @@ -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} diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb index 56b3c0849a..8025beb75c 100644 --- a/packages/gtk+/gtk+-1.2_1.2.10.bb +++ b/packages/gtk+/gtk+-1.2_1.2.10.bb @@ -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 () { diff --git a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb index aaa4b3301c..33b0423e25 100644 --- a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb +++ b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb @@ -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 } diff --git a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb index 165b2ff5f4..d27f72ae4a 100644 --- a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb +++ b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb @@ -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 } diff --git a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb index c3687b70cc..7af6879042 100644 --- a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb +++ b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb @@ -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 } diff --git a/packages/ion/ion3_0.0+ds20041104.bb b/packages/ion/ion3_0.0+ds20041104.bb index 27742e0670..45a74e60a7 100644 --- a/packages/ion/ion3_0.0+ds20041104.bb +++ b/packages/ion/ion3_0.0+ds20041104.bb @@ -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}" diff --git a/packages/ixp4xx/ixp4xx-npe_2.1.bb b/packages/ixp4xx/ixp4xx-npe_2.1.bb index 94188bedee..3370ad0c81 100644 --- a/packages/ixp4xx/ixp4xx-npe_2.1.bb +++ b/packages/ixp4xx/ixp4xx-npe_2.1.bb @@ -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 } diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb index b6a47177cb..571080bda0 100644 --- a/packages/ixp4xx/ixp4xx-npe_2.3.bb +++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb @@ -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 } diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb index 342197c8ad..978ae10be5 100644 --- a/packages/jpeg/jpeg_6b.bb +++ b/packages/jpeg/jpeg_6b.bb @@ -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" diff --git a/packages/kaffe/kaffe-qt_cvs.bb b/packages/kaffe/kaffe-qt_cvs.bb index bd5d2968f6..8edecdc868 100644 --- a/packages/kaffe/kaffe-qt_cvs.bb +++ b/packages/kaffe/kaffe-qt_cvs.bb @@ -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 \ diff --git a/packages/kf/kf_0.5.4.1.bb b/packages/kf/kf_0.5.4.1.bb index 39229f7a9b..4cfd685f43 100755 --- a/packages/kf/kf_0.5.4.1.bb +++ b/packages/kf/kf_0.5.4.1.bb @@ -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" diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb index 690df1acfa..4cc1f8d4fe 100644 --- a/packages/konqueror/konqueror-embedded_20030705.bb +++ b/packages/konqueror/konqueror-embedded_20030705.bb @@ -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} \ diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb index 221ecb0bb3..0b7e0aff8b 100644 --- a/packages/konqueror/konqueror-embedded_20060404.bb +++ b/packages/konqueror/konqueror-embedded_20060404.bb @@ -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" diff --git a/packages/kphonepi/kphonepi_1.0.0.bb b/packages/kphonepi/kphonepi_1.0.0.bb index fe1024afa8..6eb3249821 100644 --- a/packages/kphonepi/kphonepi_1.0.0.bb +++ b/packages/kphonepi/kphonepi_1.0.0.bb @@ -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() { diff --git a/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb b/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb index 7724a3605f..d022dc55cc 100644 --- a/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb +++ b/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb @@ -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() { diff --git a/packages/lbreakout/lbreakout2_2.6beta.bb b/packages/lbreakout/lbreakout2_2.6beta.bb index 49becccbd3..496a80904e 100644 --- a/packages/lbreakout/lbreakout2_2.6beta.bb +++ b/packages/lbreakout/lbreakout2_2.6beta.bb @@ -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 diff --git a/packages/libgcrypt/libgcrypt_1.1.91.bb b/packages/libgcrypt/libgcrypt_1.1.91.bb index c4259eb0f3..0eaeaaf9fc 100644 --- a/packages/libgcrypt/libgcrypt_1.1.91.bb +++ b/packages/libgcrypt/libgcrypt_1.1.91.bb @@ -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 diff --git a/packages/libgcrypt/libgcrypt_1.2.0.bb b/packages/libgcrypt/libgcrypt_1.2.0.bb index d961e4f84a..be0ad787da 100644 --- a/packages/libgcrypt/libgcrypt_1.2.0.bb +++ b/packages/libgcrypt/libgcrypt_1.2.0.bb @@ -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 diff --git a/packages/libgcrypt/libgcrypt_1.2.1.bb b/packages/libgcrypt/libgcrypt_1.2.1.bb index e797ee75c7..3f4942cae5 100644 --- a/packages/libgcrypt/libgcrypt_1.2.1.bb +++ b/packages/libgcrypt/libgcrypt_1.2.1.bb @@ -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 diff --git a/packages/libgcrypt/libgcrypt_1.2.2.bb b/packages/libgcrypt/libgcrypt_1.2.2.bb index e797ee75c7..3f4942cae5 100644 --- a/packages/libgcrypt/libgcrypt_1.2.2.bb +++ b/packages/libgcrypt/libgcrypt_1.2.2.bb @@ -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 diff --git a/packages/libgcrypt/libgcrypt_1.2.3.bb b/packages/libgcrypt/libgcrypt_1.2.3.bb index e797ee75c7..3f4942cae5 100644 --- a/packages/libgcrypt/libgcrypt_1.2.3.bb +++ b/packages/libgcrypt/libgcrypt_1.2.3.bb @@ -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 diff --git a/packages/libgpg-error/libgpg-error_0.6.bb b/packages/libgpg-error/libgpg-error_0.6.bb index fced6b7adc..4929121167 100644 --- a/packages/libgpg-error/libgpg-error_0.6.bb +++ b/packages/libgpg-error/libgpg-error_0.6.bb @@ -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 diff --git a/packages/libgpg-error/libgpg-error_0.7.bb b/packages/libgpg-error/libgpg-error_0.7.bb index c165044e83..7edea97fe1 100644 --- a/packages/libgpg-error/libgpg-error_0.7.bb +++ b/packages/libgpg-error/libgpg-error_0.7.bb @@ -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 diff --git a/packages/libgpg-error/libgpg-error_1.0.bb b/packages/libgpg-error/libgpg-error_1.0.bb index a2a19b254c..e520a23ae0 100644 --- a/packages/libgpg-error/libgpg-error_1.0.bb +++ b/packages/libgpg-error/libgpg-error_1.0.bb @@ -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 diff --git a/packages/libgpg-error/libgpg-error_1.3.bb b/packages/libgpg-error/libgpg-error_1.3.bb index a2a19b254c..e520a23ae0 100644 --- a/packages/libgpg-error/libgpg-error_1.3.bb +++ b/packages/libgpg-error/libgpg-error_1.3.bb @@ -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 diff --git a/packages/libmikmod/libmikmod_3.1.11.bb b/packages/libmikmod/libmikmod_3.1.11.bb index 47128165b1..ad3f895db8 100644 --- a/packages/libmikmod/libmikmod_3.1.11.bb +++ b/packages/libmikmod/libmikmod_3.1.11.bb @@ -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/ } diff --git a/packages/libnet/libnet_1.0.2a.bb b/packages/libnet/libnet_1.0.2a.bb index 071a53e0cd..6e6067cf8f 100644 --- a/packages/libnet/libnet_1.0.2a.bb +++ b/packages/libnet/libnet_1.0.2a.bb @@ -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/ diff --git a/packages/libol/libol_0.3.16.bb b/packages/libol/libol_0.3.16.bb index 1f11d8371c..18bc4aa66e 100644 --- a/packages/libol/libol_0.3.16.bb +++ b/packages/libol/libol_0.3.16.bb @@ -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/ diff --git a/packages/libol/libol_0.3.18.bb b/packages/libol/libol_0.3.18.bb index dae22db04e..3ddaaa62a3 100644 --- a/packages/libol/libol_0.3.18.bb +++ b/packages/libol/libol_0.3.18.bb @@ -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/ diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc index 9f488f346d..17ac4e2605 100644 --- a/packages/libopie/libopie2.inc +++ b/packages/libopie/libopie2.inc @@ -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() { diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc index 832aff7cd0..342c7d643b 100644 --- a/packages/libqpe/libqpe-opie.inc +++ b/packages/libqpe/libqpe-opie.inc @@ -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() { diff --git a/packages/libqtaux/libqtaux2.inc b/packages/libqtaux/libqtaux2.inc index 258df26a15..f8721678cf 100644 --- a/packages/libqtaux/libqtaux2.inc +++ b/packages/libqtaux/libqtaux2.inc @@ -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() { diff --git a/packages/libsdl/libsdl-mixer_1.2.6.bb b/packages/libsdl/libsdl-mixer_1.2.6.bb index ffc1c6956f..f78d992806 100644 --- a/packages/libsdl/libsdl-mixer_1.2.6.bb +++ b/packages/libsdl/libsdl-mixer_1.2.6.bb @@ -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 diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb index 7b78d2ae51..270ac8f6e5 100644 --- a/packages/libxine/libxine_1.1.0.bb +++ b/packages/libxine/libxine_1.1.0.bb @@ -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 diff --git a/packages/linux/ixp4xx-kernel-svnpatch.inc b/packages/linux/ixp4xx-kernel-svnpatch.inc index 601d7e9090..992310b5a8 100644 --- a/packages/linux/ixp4xx-kernel-svnpatch.inc +++ b/packages/linux/ixp4xx-kernel-svnpatch.inc @@ -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 } diff --git a/packages/misc-binary-only/tda1004x-firmware.bb b/packages/misc-binary-only/tda1004x-firmware.bb index 77e936fa9b..317a980852 100644 --- a/packages/misc-binary-only/tda1004x-firmware.bb +++ b/packages/misc-binary-only/tda1004x-firmware.bb @@ -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)) diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb index 79f22e8562..527629d413 100644 --- a/packages/mysql/mysql_4.1.18.bb +++ b/packages/mysql/mysql_4.1.18.bb @@ -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() { 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" diff --git a/packages/omniorb/omniorb_4.0.7.bb b/packages/omniorb/omniorb_4.0.7.bb index d475b22791..4909faaa1f 100644 --- a/packages/omniorb/omniorb_4.0.7.bb +++ b/packages/omniorb/omniorb_4.0.7.bb @@ -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 () { diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index 8c7064b3ce..4f42d78ded 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -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_confi