Patchwork [meta-opie,2/6] qmake: do also provide nativesdk variant

login
register
mail settings
Submitter lumag
Date Dec. 13, 2011, 4:44 p.m.
Message ID <1323794683-24233-3-git-send-email-dbaryshkov@gmail.com>
Download mbox | patch
Permalink /patch/16849/
State Accepted
Headers show

Comments

lumag - Dec. 13, 2011, 4:44 p.m.
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>
---
 .../{qmake-native_1.07a.bb => qmake_1.07a.bb}      |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
 rename recipes-qt/qmake/{qmake-native_1.07a.bb => qmake_1.07a.bb} (92%)

Patch

diff --git a/recipes-qt/qmake/qmake-native_1.07a.bb b/recipes-qt/qmake/qmake_1.07a.bb
similarity index 92%
rename from recipes-qt/qmake/qmake-native_1.07a.bb
rename to recipes-qt/qmake/qmake_1.07a.bb
index e4f0cd5..8bd57b2 100644
--- a/recipes-qt/qmake/qmake-native_1.07a.bb
+++ b/recipes-qt/qmake/qmake_1.07a.bb
@@ -13,10 +13,11 @@  S = "${WORKDIR}/${QTEVER}"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=629178675a7d49c9fa19dfe9f43ea256 \
                     file://README;beginline=1;endline=7;md5=a85582a7befb26735438461afd8559af"
 
-inherit autotools native
+inherit qmake_base
+BBCLASSEXTEND = "native nativesdk"
 
 export QTDIR = "${S}"
-EXTRA_OEMAKE = "-e"
+EXTRA_OECONF += "-platform ${HOST_OS}-oe-g++"
 
 do_configure() {
 	# Install the OE build templates
@@ -26,9 +27,6 @@  do_configure() {
 		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"
 }