From 1b0cbb809e09eddff243e874edff54a4b0c25626 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 14 Jul 2008 08:33:53 +0000 Subject: [PATCH] qmake2: add sdk version --- .../qmake/{qmake2-native => files}/0001-fix-mkspecs.patch | 0 .../{qmake2-native => files}/0008-backport-qt-lib-infix.patch | 0 packages/qmake/{qmake2-native => files}/qt-config.patch | 0 packages/qmake/{qmake2-native => files}/use-lflags-last.patch | 0 packages/qmake/qmake2-native.inc | 1 - packages/qmake/qmake2-native_2.10a.bb | 1 + packages/qmake/qmake2-sdk/.mtn2git_empty | 0 packages/qmake/qmake2-sdk/linux-oe-qmake.conf | 1 + packages/qmake/qmake2-sdk_2.10a.bb | 4 ++++ 9 files changed, 6 insertions(+), 1 deletion(-) rename packages/qmake/{qmake2-native => files}/0001-fix-mkspecs.patch (100%) rename packages/qmake/{qmake2-native => files}/0008-backport-qt-lib-infix.patch (100%) rename packages/qmake/{qmake2-native => files}/qt-config.patch (100%) rename packages/qmake/{qmake2-native => files}/use-lflags-last.patch (100%) create mode 100644 packages/qmake/qmake2-sdk/.mtn2git_empty create mode 100644 packages/qmake/qmake2-sdk/linux-oe-qmake.conf create mode 100644 packages/qmake/qmake2-sdk_2.10a.bb diff --git a/packages/qmake/qmake2-native/0001-fix-mkspecs.patch b/packages/qmake/files/0001-fix-mkspecs.patch similarity index 100% rename from packages/qmake/qmake2-native/0001-fix-mkspecs.patch rename to packages/qmake/files/0001-fix-mkspecs.patch diff --git a/packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch b/packages/qmake/files/0008-backport-qt-lib-infix.patch similarity index 100% rename from packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch rename to packages/qmake/files/0008-backport-qt-lib-infix.patch diff --git a/packages/qmake/qmake2-native/qt-config.patch b/packages/qmake/files/qt-config.patch similarity index 100% rename from packages/qmake/qmake2-native/qt-config.patch rename to packages/qmake/files/qt-config.patch diff --git a/packages/qmake/qmake2-native/use-lflags-last.patch b/packages/qmake/files/use-lflags-last.patch similarity index 100% rename from packages/qmake/qmake2-native/use-lflags-last.patch rename to packages/qmake/files/use-lflags-last.patch diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc index c609fefb81..55b402655e 100644 --- a/packages/qmake/qmake2-native.inc +++ b/packages/qmake/qmake2-native.inc @@ -7,7 +7,6 @@ PR = "r2" QTVER = "qtopia-core-opensource-src-${QTVERSION}" -FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native" SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.gz \ file://0001-fix-mkspecs.patch;patch=1 \ file://0008-backport-qt-lib-infix.patch;patch=1 \ diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb index 89b2ae5a82..07e97c4413 100644 --- a/packages/qmake/qmake2-native_2.10a.bb +++ b/packages/qmake/qmake2-native_2.10a.bb @@ -1,2 +1,3 @@ QTVERSION="4.3.3" +FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native" require ${PN}.inc diff --git a/packages/qmake/qmake2-sdk/.mtn2git_empty b/packages/qmake/qmake2-sdk/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qmake/qmake2-sdk/linux-oe-qmake.conf b/packages/qmake/qmake2-sdk/linux-oe-qmake.conf new file mode 100644 index 0000000000..f58481a693 --- /dev/null +++ b/packages/qmake/qmake2-sdk/linux-oe-qmake.conf @@ -0,0 +1 @@ +include(../linux-g++/qmake.conf) diff --git a/packages/qmake/qmake2-sdk_2.10a.bb b/packages/qmake/qmake2-sdk_2.10a.bb new file mode 100644 index 0000000000..3c00d81cdc --- /dev/null +++ b/packages/qmake/qmake2-sdk_2.10a.bb @@ -0,0 +1,4 @@ +QTVERSION="4.3.3" +require qmake2-native.inc + +inherit sdk -- 2.39.5