qmake: Turn native package into a cross package since it touches target staging

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3333 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
index d0f59d2cd4b9853324984546152d4216d8420d7d..5d221cc5d56ae631f7393fdec6578374b2e04983 100644 (file)
--- a/meta/classes/qmake2.bbclass
+++ b/meta/classes/qmake2.bbclass
@@ -3,7 +3,7 @@
 #
 inherit qmake_base
 
-DEPENDS_prepend = "qmake2-native uicmoc4-native "
+DEPENDS_prepend = "qmake2-cross uicmoc4-native "
 
 export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
 export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"

diff --git a/meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch b/meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch
similarity index 100%
rename from meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch
rename to meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch

diff --git a/meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf b/meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf
similarity index 100%
rename from meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf
rename to meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf

diff --git a/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch b/meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch
similarity index 100%
rename from meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch
rename to meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch

diff --git a/meta/packages/qmake/qmake2-native_2.10a.bb b/meta/packages/qmake/qmake2-cross_2.10a.bb
similarity index 98%
rename from meta/packages/qmake/qmake2-native_2.10a.bb
rename to meta/packages/qmake/qmake2-cross_2.10a.bb
index 84df0ef732ddf1cb806ddfdfcc89965742542104..99fe90722ad2d99957f3579786b26093b20f425a 100644 (file)
--- a/meta/packages/qmake/qmake2-native_2.10a.bb
+++ b/meta/packages/qmake/qmake2-cross_2.10a.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/${QTVER}"
 
 # we need the real target system here
 CROSS_SYS := "${TARGET_SYS}"
-inherit autotools native
+inherit autotools cross
 
 export QTDIR = "${S}"
 EXTRA_OEMAKE = "-e"