[oe-commits] org.oe.dev qt, qte, qt4: Use better staging variables

[rpurdie commit]

qt, qte, qt4: Use better staging variables

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: dc145b86ddda11dac6a761681445c4237a2a795a
ViewMTN: http://monotone.openembedded.org/revision/info/dc145b86ddda11dac6a761681445c4237a2a795a
Files:
1
packages/qt/qt-x11-free-common.inc
packages/qt/qt-x11-free-native_3.3.5.bb
packages/qt4/qt4-x11-free_4.1.2.bb
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt-static_2.3.10.bb
packages/qte/qte-mt-static_2.3.12.bb
Diffs:

#
# mt diff -rea8187e26f157890e17bc524a4b3466ae90ae376 -rdc145b86ddda11dac6a761681445c4237a2a795a
#
# 
# 
# patch "packages/qt/qt-x11-free-common.inc"
#  from [6dcb32e86f0ad84e9cccbc5e9c36107259b8a388]
#    to [d07ee8f7619a8af14a1e90c1820feaffd407969a]
# 
# patch "packages/qt/qt-x11-free-native_3.3.5.bb"
#  from [59251d06fe96fd830e70b5d3f020c7ae2c0aec22]
#    to [8f8828676843b9ef004c141ea764624a17f4e4de]
# 
# patch "packages/qt4/qt4-x11-free_4.1.2.bb"
#  from [3f0c2bbb385a352c8af18085b894d4224822db3c]
#    to [40cb1e9a0fecc27be589b5bce0159daa9b1b3559]
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [954d5e2c5dc204e10fdd77b8badc87ea4892ccb0]
#    to [0aac8dfbf78ecb980a8817d0ceef6220a54f4724]
# 
# patch "packages/qte/qte-mt-static_2.3.10.bb"
#  from [0e4fb9a326b0c9f986910827e9c39d1d1cddf0b5]
#    to [31328536466adee57ee327c6775b190348b68f04]
# 
# patch "packages/qte/qte-mt-static_2.3.12.bb"
#  from [ad00c3d93621b32217e70b5334b51eb19c1d2f57]
#    to [2f1b26102de47e5a71dd254377cbd267ffa58456]
# 
============================================================
--- packages/qt/qt-x11-free-common.inc	6dcb32e86f0ad84e9cccbc5e9c36107259b8a388
+++ packages/qt/qt-x11-free-common.inc	d07ee8f7619a8af14a1e90c1820feaffd407969a
@@ -9,7 +9,7 @@ export QTDIR = "${S}"
 inherit qmake_base qt3x11
 
 export QTDIR = "${S}"
-STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
+STAGING_QT_DIR = "${STAGING_DIR_HOST}/qt3"
 ARCH_i686 = "x86"
 EXTRA_OEMAKE = "-e"
 
============================================================
--- packages/qt/qt-x11-free-native_3.3.5.bb	59251d06fe96fd830e70b5d3f020c7ae2c0aec22
+++ packages/qt/qt-x11-free-native_3.3.5.bb	8f8828676843b9ef004c141ea764624a17f4e4de
@@ -41,16 +41,16 @@ do_stage() {
 }
 
 do_stage() {
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt3/lib
-	oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_DIR}/${HOST_SYS}/qt3/lib
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt3/include/private
+	install -d ${STAGING_DIR_HOST}/qt3/lib
+	oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_DIR_HOST}/qt3/lib
+	install -d ${STAGING_DIR_HOST}/qt3/include/private
 	for f in include/*.h
 	do
-		install -m 0644 $f ${STAGING_DIR}/${HOST_SYS}/qt3/include/
+		install -m 0644 $f ${STAGING_DIR_HOST}/qt3/include/
 	done
 	for f in include/private/*.h
 	do
-	        install -m 0644 $f ${STAGING_DIR}/${HOST_SYS}/qt3/include/private
+	        install -m 0644 $f ${STAGING_DIR_HOST}/qt3/include/private
 	done
 }
 
============================================================
--- packages/qt4/qt4-x11-free_4.1.2.bb	3f0c2bbb385a352c8af18085b894d4224822db3c
+++ packages/qt4/qt4-x11-free_4.1.2.bb	40cb1e9a0fecc27be589b5bce0159daa9b1b3559
@@ -22,7 +22,7 @@ export QTDIR = "${S}"
 inherit qmake_base qt4x11 pkgconfig
 
 export QTDIR = "${S}"
-STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4"
+STAGING_QT_DIR = "${STAGING_DIR_TARGET}/qt4"
 EXTRA_OEMAKE = "-e"
 
 require qt4_arch.inc
============================================================
--- packages/qte/qte-common_2.3.10.inc	954d5e2c5dc204e10fdd77b8badc87ea4892ccb0
+++ packages/qte/qte-common_2.3.10.inc	0aac8dfbf78ecb980a8817d0ceef6220a54f4724
@@ -134,13 +134,13 @@ do_stage() {
 }
 
 do_stage() {
-	rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-	oe_libinstall -so -C lib lib${PN} ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+	rm -rf ${STAGING_DIR_HOST}/qt2
+	install -d ${STAGING_DIR_HOST}/qt2/lib
+	oe_libinstall -so -C lib lib${PN} ${STAGING_DIR_HOST}/qt2/lib
 	rm -f include/qxt.h
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
-	cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
-	cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
+	install -d ${STAGING_DIR_HOST}/qt2/include
+	cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include
+	cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/
 }
 
 do_install() {
============================================================
--- packages/qte/qte-mt-static_2.3.10.bb	0e4fb9a326b0c9f986910827e9c39d1d1cddf0b5
+++ packages/qte/qte-mt-static_2.3.10.bb	31328536466adee57ee327c6775b190348b68f04
@@ -6,13 +6,13 @@ do_stage() {
 EXTRA_OECONF += "-static -thread"
 
 do_stage() {
-	rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-	oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+	rm -rf ${STAGING_DIR_HOST}/qt2
+	install -d ${STAGING_DIR_HOST}/qt2/lib
+	oe_libinstall -a -C lib libqte-mt ${STAGING_DIR_HOST}/qt2/lib
 	rm -f include/qxt.h
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
-	cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
-	cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
+	install -d ${STAGING_DIR_HOST}/qt2/include
+	cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include
+	cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/
 }
 
 do_install() {
============================================================
--- packages/qte/qte-mt-static_2.3.12.bb	ad00c3d93621b32217e70b5334b51eb19c1d2f57
+++ packages/qte/qte-mt-static_2.3.12.bb	2f1b26102de47e5a71dd254377cbd267ffa58456
@@ -6,14 +6,14 @@ do_stage() {
 EXTRA_OECONF += "-static -thread"
 
 do_stage() {
-	rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
-	oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+	rm -rf ${STAGING_DIR_HOST}/qt2
+	install -d ${STAGING_DIR_HOST}/qt2/lib
+	oe_libinstall -a -C lib libqte-mt ${STAGING_DIR_HOST}/qt2/lib
 	rm -f include/qxt.h
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
-	cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
-	cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
-	install -m 0644 src/kernel/qsnoopdata_qws_p.h ${STAGING_DIR}/${HOST_SYS}/qt2/include/
+	install -d ${STAGING_DIR_HOST}/qt2/include
+	cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include
+	cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/
+	install -m 0644 src/kernel/qsnoopdata_qws_p.h ${STAGING_DIR_HOST}/qt2/include/
 }
 
 do_install() {