qmake2: convert native and sdk to use BBCLASS_EXTEND and new-style staging

5 files changed, 33 insertions, 27 deletions

diff --git a/recipes/qmake/files/qmake-hack.diff b/recipes/qmake/files/qmake-hack.diff
new file mode 100644
index 0000000000..290f54052b
--- /dev/null
+++ b/recipes/qmake/files/qmake-hack.diff
@@ -0,0 +1,15 @@
+--- /tmp/configure	2010-02-10 15:41:58.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.4.3/configure	2010-02-10 15:42:01.000000000 +0100
+@@ -3946,6 +3946,12 @@
+     [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
+     [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
+     [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
++
++# OE
++if [ x$CROSSHACK = xtrue ] ; then
++	echo "Exiting now, since we have what we want: a qmake binary"
++	exit 0
++fi
+ fi # Build qmake
+ 
+ #-------------------------------------------------------------------------------
diff --git a/recipes/qmake/qmake2-native_2.10a.bb b/recipes/qmake/qmake2-native_2.10a.bb
deleted file mode 100644
index 4579838b43..0000000000
--- a/recipes/qmake/qmake2-native_2.10a.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-QTVERSION="4.4.3"
-FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
-
-inherit native
-
-require ${PN}.inc
-
-do_install() {
-    :
-}
-
-
diff --git a/recipes/qmake/qmake2-native.inc b/recipes/qmake/qmake2.inc
index 990820066a..6924d1f5ec 100644
--- a/recipes/qmake/qmake2-native.inc
+++ b/recipes/qmake/qmake2.inc
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r7"
+PR = "r8"
 
 # We call 'moc' during the build 
 DEPENDS = "uicmoc4-native"
@@ -19,10 +19,18 @@ S = "${WORKDIR}/${QTVER}"
 
 inherit autotools  
 
+CROSSHACK = "true"
+CROSSHACK_virtclass-native = ""
+CROSSHACK_virtclass-nativesdk = ""
+
+export CROSSHACK
 export QTDIR = "${S}"
 EXTRA_OEMAKE = "-e"
 
+TARGET_CC_ARCH += "${LDFLAGS}"
+
 do_configure() {
+
     # Make sure we regenerate all Makefiles 
     find ${S} -name "Makefile" | xargs rm
     # Install the OE build templates
@@ -58,10 +66,4 @@ do_compile() {
     :
 }
 
-do_stage() {
-	install -d ${STAGING_BINDIR_NATIVE}	
-	install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
-	install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake-qt4
-	install -d ${STAGING_DATADIR_NATIVE}/qt4
-	cp -PfR mkspecs ${STAGING_DATADIR_NATIVE}/qt4/
-}
+FILES_${PN} += "${datadir}/qt4/"
diff --git a/recipes/qmake/qmake2-native/linux-oe-qmake.conf b/recipes/qmake/qmake2/linux-oe-qmake.conf
index f58481a693..f58481a693 100644
--- a/recipes/qmake/qmake2-native/linux-oe-qmake.conf
+++ b/recipes/qmake/qmake2/linux-oe-qmake.conf
diff --git a/recipes/qmake/qmake2-sdk_2.10a.bb b/recipes/qmake/qmake2_2.10a.bb
index 6ed9ebdebb..abf4380b7c 100644
--- a/recipes/qmake/qmake2-sdk_2.10a.bb
+++ b/recipes/qmake/qmake2_2.10a.bb
@@ -1,10 +1,14 @@
 QTVERSION="4.4.3"
-require qmake2-native.inc
+FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2"
 
-inherit sdk
+BBCLASSEXTEND = "native sdk"
 
-do_install () {
-	install -d ${D}/${bindir}
+require ${PN}.inc
+
+SRC_URI += "file://qmake-hack.diff;patch=1"
+
+do_install() {
+    install -d ${D}/${bindir}
     install -m 0755 bin/qmake ${D}/${bindir}/qmake2
     install -m 0755 bin/qmake ${D}/${bindir}/qmake-qt4
     install -d ${D}/${datadir}/qt4
@@ -12,6 +16,3 @@ do_install () {
 }
 
 
-
-
-