[oe-commits] org.oe.dev classes: Improve various staging variable references

[rpurdie commit]

classes: Improve various staging variable references

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: abefd5c15ebfe091ec64838729bdcd9a756919b8
ViewMTN: http://monotone.openembedded.org/revision/info/abefd5c15ebfe091ec64838729bdcd9a756919b8
Files:
1
classes/package.bbclass
classes/package_ipk.bbclass
classes/qt3e.bbclass
classes/qt3x11.bbclass
Diffs:

#
# mt diff -ra350c95a839d4b63f1807a2cb37baca67bed7213 -rabefd5c15ebfe091ec64838729bdcd9a756919b8
#
# 
# 
# patch "classes/package.bbclass"
#  from [770c055d09c5280cd9c6ca2b7c1280e7540b3356]
#    to [cd20e29d5ac82c1f004df7096eb69486fad995b7]
# 
# patch "classes/package_ipk.bbclass"
#  from [fdf9fdf2855198b24b017026dd3777995b2977d2]
#    to [5034d6b967ea7da5ccaf3b815655ea7f85cd3ca0]
# 
# patch "classes/qt3e.bbclass"
#  from [13fd2f64835873afe33fd96ebb2d538da23fbd4f]
#    to [811e365ef0d4b3e9f85313437c89d53a8e7c8773]
# 
# patch "classes/qt3x11.bbclass"
#  from [021061b87cd1c52fec22479c0efe7312a0d41898]
#    to [532e247f5a25ce05797b079449fe17bcbe679471]
# 
============================================================
--- classes/package.bbclass	770c055d09c5280cd9c6ca2b7c1280e7540b3356
+++ classes/package.bbclass	cd20e29d5ac82c1f004df7096eb69486fad995b7
@@ -519,7 +519,7 @@ fi
 fi
 }
 
-SHLIBSDIR = "${STAGING_DIR}/${HOST_SYS}/shlibs"
+SHLIBSDIR = "${STAGING_DIR_HOST}/shlibs"
 
 python package_do_shlibs() {
 	import os, re, os.path
============================================================
--- classes/package_ipk.bbclass	fdf9fdf2855198b24b017026dd3777995b2977d2
+++ classes/package_ipk.bbclass	5034d6b967ea7da5ccaf3b815655ea7f85cd3ca0
@@ -12,6 +12,10 @@ python package_ipk_install () {
 }
 
 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)
============================================================
--- classes/qt3e.bbclass	13fd2f64835873afe33fd96ebb2d538da23fbd4f
+++ classes/qt3e.bbclass	811e365ef0d4b3e9f85313437c89d53a8e7c8773
@@ -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} "
============================================================
--- classes/qt3x11.bbclass	021061b87cd1c52fec22479c0efe7312a0d41898
+++ classes/qt3x11.bbclass	532e247f5a25ce05797b079449fe17bcbe679471
@@ -1,9 +1,9 @@ EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
 DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}"
 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"