From 2f67ac9db9d3fd5883c5e0d954f8cf30bd97170c Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Tue, 13 Dec 2011 20:24:40 +0400
Subject: qmake: do also provide nativesdk variant

Opie SDK needs nativesdk version of qmake package. To achieve this, replace qmake-native
with qmake recipe, which can be built both as virtclass-native and virtclass-nativesdk.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 recipes-qt/qmake/qmake-native_1.07a.bb | 50 ----------------------------------
 recipes-qt/qmake/qmake_1.07a.bb        | 48 ++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 50 deletions(-)
 delete mode 100644 recipes-qt/qmake/qmake-native_1.07a.bb
 create mode 100644 recipes-qt/qmake/qmake_1.07a.bb

diff --git a/recipes-qt/qmake/qmake-native_1.07a.bb b/recipes-qt/qmake/qmake-native_1.07a.bb
deleted file mode 100644
index e4f0cd5..0000000
--- a/recipes-qt/qmake/qmake-native_1.07a.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "TrollTech Makefile Generator"
-HOMEPAGE = "http://www.trolltech.com"
-SECTION = "devel"
-LICENSE = "GPLv2 | QPL"
-PR = "r7"
-
-QTEVER = "qt-embedded-free-3.3.5"
-
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTEVER}.tar.bz2 \
-           file://linux-oe-qmake.conf"
-S = "${WORKDIR}/${QTEVER}"
-
-LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=629178675a7d49c9fa19dfe9f43ea256 \
-                    file://README;beginline=1;endline=7;md5=a85582a7befb26735438461afd8559af"
-
-inherit autotools native
-
-export QTDIR = "${S}"
-EXTRA_OEMAKE = "-e"
-
-do_configure() {
-	# Install the OE build templates
-	for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibceabi-oe-g++
-	do
-		install -d ${S}/mkspecs/$template
-		install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
-		ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
-	done
-	QMAKESPEC=
-	PLATFORM=${HOST_OS}-oe-g++
-	export PLATFORM
-	bbnote ./configure ${EXTRA_OECONF}
-	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
-}
-
-do_compile() {
-	:
-}
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 bin/qmake ${D}${bindir}
-        install -d ${D}${datadir}/qmake
-        cp -fPR mkspecs/* ${D}${datadir}/qmake
-}
-
-SRC_URI[md5sum] = "022d7a3c572b554f3c47b12cae71a8a4"
-SRC_URI[sha256sum] = "a97656796c0ef8e87dd83e6138bc406e31830d08f9b213e039d8be39ea65c8e4"
-
-NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes-qt/qmake/qmake_1.07a.bb b/recipes-qt/qmake/qmake_1.07a.bb
new file mode 100644
index 0000000..8bd57b2
--- /dev/null
+++ b/recipes-qt/qmake/qmake_1.07a.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "TrollTech Makefile Generator"
+HOMEPAGE = "http://www.trolltech.com"
+SECTION = "devel"
+LICENSE = "GPLv2 | QPL"
+PR = "r7"
+
+QTEVER = "qt-embedded-free-3.3.5"
+
+SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTEVER}.tar.bz2 \
+           file://linux-oe-qmake.conf"
+S = "${WORKDIR}/${QTEVER}"
+
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=629178675a7d49c9fa19dfe9f43ea256 \
+                    file://README;beginline=1;endline=7;md5=a85582a7befb26735438461afd8559af"
+
+inherit qmake_base
+BBCLASSEXTEND = "native nativesdk"
+
+export QTDIR = "${S}"
+EXTRA_OECONF += "-platform ${HOST_OS}-oe-g++"
+
+do_configure() {
+	# Install the OE build templates
+	for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibceabi-oe-g++
+	do
+		install -d ${S}/mkspecs/$template
+		install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
+		ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
+	done
+	bbnote ./configure ${EXTRA_OECONF}
+	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
+}
+
+do_compile() {
+	:
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 bin/qmake ${D}${bindir}
+        install -d ${D}${datadir}/qmake
+        cp -fPR mkspecs/* ${D}${datadir}/qmake
+}
+
+SRC_URI[md5sum] = "022d7a3c572b554f3c47b12cae71a8a4"
+SRC_URI[sha256sum] = "a97656796c0ef8e87dd83e6138bc406e31830d08f9b213e039d8be39ea65c8e4"
+
+NATIVE_INSTALL_WORKS = "1"
-- 
cgit 1.2.3-korg