From cfd98f5000b28c9f2958600ba8cebf457ca8f67c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 12 Dec 2007 08:43:07 +0000
Subject: [PATCH] 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
---
 meta/classes/qmake2.bbclass                                     | 2 +-
 .../0001-fix-mkspecs.patch                                      | 0
 .../linux-oe-qmake.conf                                         | 0
 .../use-lflags-last.patch                                       | 0
 .../qmake/{qmake2-native_2.10a.bb => qmake2-cross_2.10a.bb}     | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/packages/qmake/{qmake2-native-2.10a => qmake2-cross-2.10a}/0001-fix-mkspecs.patch (100%)
 rename meta/packages/qmake/{qmake2-native-2.10a => qmake2-cross-2.10a}/linux-oe-qmake.conf (100%)
 rename meta/packages/qmake/{qmake2-native-2.10a => qmake2-cross-2.10a}/use-lflags-last.patch (100%)
 rename meta/packages/qmake/{qmake2-native_2.10a.bb => qmake2-cross_2.10a.bb} (98%)

diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
index d0f59d2cd4..5d221cc5d5 100644
--- 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 84df0ef732..99fe90722a 100644
--- 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"