classes: Improve various staging variable references

diff --git a/classes/package.bbclass b/classes/package.bbclass
index cb4417fc7ff6aed00667eae450b59d8898c99020..325c0b52f53923fdc256edd35887a2e3162a2408 100644 (file)
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -519,7 +519,7 @@ if [ x"$D" = "x" ]; then
 fi
 }
 
-SHLIBSDIR = "${STAGING_DIR}/${HOST_SYS}/shlibs"
+SHLIBSDIR = "${STAGING_DIR_HOST}/shlibs"
 
 python package_do_shlibs() {
        import os, re, os.path

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index de7f0fe0c4d0cd0dd97d3adcbbff94c8bb52661d..2feaeba3b3fc62886a1f05c5c0c4cc1245f0e750 100644 (file)
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -12,6 +12,10 @@ python package_ipk_fn () {
 }
 
 python package_ipk_install () {
+       #
+       # Warning - this function is not multimachine safe (see stagingdir reference)!
+       #
+
        import os, sys
        pkg = bb.data.getVar('PKG', d, 1)
        pkgfn = bb.data.getVar('PKGFN', d, 1)

diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass
index 98c47adb900e1c06edb7cc46fb40b0acae2c06fa..35958b34ab7d6ab922eacf77a1ae6a373e80c615 100644 (file)
--- a/classes/qt3e.bbclass
+++ b/classes/qt3e.bbclass
@@ -1,8 +1,8 @@
 #
 # override variables set by qmake_base to compile Qt/X11 apps
 #
-export QTDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
-export QTEDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
+export QTDIR="${STAGING_DIR_HOST}/qte3"
+export QTEDIR="${STAGING_DIR_HOST}/qte3"
 export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
 export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
 export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "

diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass
index 67f2cf7348a8676744841efb528617ab8b0567aa..5408b7f3422c85923fad41c96b529d10a077a357 100644 (file)
--- a/classes/qt3x11.bbclass
+++ b/classes/qt3x11.bbclass
@@ -3,7 +3,7 @@ EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
 #
 # override variables set by qmake_base to compile Qt/X11 apps
 #
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
+export QTDIR = "${STAGING_DIR_HOST}/qt3"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3"
 export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc3"
 export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"