diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-12-12 08:43:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-12-12 08:43:07 +0000 |
| commit | cfd98f5000b28c9f2958600ba8cebf457ca8f67c (patch) | |
| tree | 1b2d6c0bd8c0ace62afaba41539d2713b2f9488e | |
| parent | 4db23a9e9061313d0c4c31c7f1b6915e9b1c0d35 (diff) | |
| download | openembedded-core-cfd98f5000b28c9f2958600ba8cebf457ca8f67c.tar.gz openembedded-core-cfd98f5000b28c9f2958600ba8cebf457ca8f67c.tar.bz2 openembedded-core-cfd98f5000b28c9f2958600ba8cebf457ca8f67c.zip | |
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
| -rw-r--r-- | meta/classes/qmake2.bbclass | 2 | ||||
| -rw-r--r-- | meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch (renamed from meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf (renamed from meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf) | 0 | ||||
| -rw-r--r-- | meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch (renamed from meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/qmake/qmake2-cross_2.10a.bb (renamed from meta/packages/qmake/qmake2-native_2.10a.bb) | 2 |
5 files changed, 2 insertions, 2 deletions
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 index abebfdfa27..abebfdfa27 100644 --- a/meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch +++ b/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 index f58481a693..f58481a693 100644 --- a/meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf +++ b/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 index 4197dbbf64..4197dbbf64 100644 --- a/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch +++ b/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 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" |