aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-11-29 11:34:04 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-11-29 11:34:04 +0000
commit081432e434818a616a523f9f2bb18e707e4e68e3 (patch)
tree66e473e317db4a0f1056c474b26fdefde6e6ec6e /classes
parent12bb4c41c375d36b596ba4eb0a9c8ce1d6ace10e (diff)
downloadopenembedded-081432e434818a616a523f9f2bb18e707e4e68e3.tar.gz
openembedded-081432e434818a616a523f9f2bb18e707e4e68e3.tar.bz2
openembedded-081432e434818a616a523f9f2bb18e707e4e68e3.zip
Introduce STAGING_BINDIR_CROSS and STAGING_BINDIR_NATIVE as discussed on the mailing list. There should be no functionality changes yet.
Diffstat (limited to 'classes')
-rw-r--r--classes/ccdv.bbclass2
-rw-r--r--classes/distutils.bbclass4
-rw-r--r--classes/insane.bbclass2
-rw-r--r--classes/mozilla.bbclass6
-rw-r--r--classes/native.bbclass2
-rw-r--r--classes/qmake-base.bbclass6
-rw-r--r--classes/qt3e.bbclass4
-rw-r--r--classes/qt3x11.bbclass4
-rw-r--r--classes/qt4x11.bbclass8
-rw-r--r--classes/rubyextension.bbclass6
-rw-r--r--classes/scons.bbclass4
11 files changed, 25 insertions, 23 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."
}