Changes for new qmake.oeclass

 - uicmoc-native,uicmoc3-native: use the qmake-base.oeclass to get just vars
        and use those to generate appropriate qt config for build.
 - qmake-native: updates for the new qmake.oeclass
 - misc others: comment noting availability of new oeclass


BKrev: 40a19cc5EKcFkTs6PkSDRpLd_cuwwg

2 files changed, 33 insertions, 36 deletions

diff --git a/uicmoc/uicmoc-native_2.3.7.oe b/uicmoc/uicmoc-native_2.3.7.oe
index d3d61edaad..827d555f33 100644
--- a/uicmoc/uicmoc-native_2.3.7.oe
+++ b/uicmoc/uicmoc-native_2.3.7.oe
@@ -5,44 +5,37 @@ LICENSE = "GPL/QPL"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \
            file://${FILESDIR}/fix-makefile.patch;patch=1"
+
 S = "${WORKDIR}/qt-${PV}"
 
-inherit autotools native
+inherit native qmake-base
 
 export QTDIR = "${S}"
-export SYSCONF_CXX = "${CCACHE} g++"
-export SYSCONF_CC  = "${CCACHE} gcc"
-export SYSCONF_LINK  = "${CCACHE} g++"
-
-ARCH_i686 = "x86"
+CXXFLAGS += " -DQWS"
 
-EXTRA_OECONF = "-depths 8,16 -no-qvfb -no-g++-exceptions -no-jpeg -no-mng -qt-zlib -qt-libpng -no-xft -no-xkb -no-vnc -no-sm -no-opengl -static -qconfig oe"
-EXTRA_OEMAKE = "-e"
+QT_CONFIG_FLAGS = "-depths 8,16 -no-qvfb -no-g++-exceptions -no-jpeg -no-mng \
+                   -qt-zlib -qt-libpng -no-xft -no-xkb -no-vnc -no-sm \
+                   -no-opengl -static -qconfig oe"
 
 do_configure() {
-	echo "#define QT_NO_FREETYPE" >>src/tools/qconfig-oe.h
-        oenote ./configure ${EXTRA_OECONF}
-        echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
+    touch src/tools/qconfig-oe.h
+    echo "#define QT_NO_FREETYPE" >> src/tools/qconfig-oe.h
+    echo yes | ./configure ${QT_CONFIG_FLAGS} || die "Configuring qt failed"
 }
 
 do_compile() {
-        unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
-	oe_runmake symlinks || die "Can't symlink include files"
-        cd ${S}/src/moc && oe_runmake || die "Building moc failed"
-        cp ${S}/src/moc/moc ${S}/bin
-        cd ${S}/src && oe_runmake || die "Building libqt.a failed"
-        cd ${S}/tools/designer/util && oe_runmake || die "Building libqutil.a failed"
-        cd ${S}/tools/designer/uic && oe_runmake || die "Building uic failed"
-        cd ${S}/tools/qvfb && oe_runmake || die "Building qvfb failed"
-}
-
-do_stage() {
-        install -m 0755 bin/moc ${STAGING_BINDIR}
-        install -m 0755 bin/uic ${STAGING_BINDIR}
-}
+    oe_runmake symlinks   || die "Can't symlink include files"
+    oe_runmake -C src/moc || die "Building moc failed"
 
-do_install() {
+    cp src/moc/moc bin/
 
-        sleep 1
+    oe_runmake -C src                 || die "Building libqt.a failed"
+    oe_runmake -C tools/designer/util || die "Building libqutil.a failed"
+    oe_runmake -C tools/designer/uic  || die "Building uic failed"
+    oe_runmake -C tools/qvfb          || die "Building qvfb failed"
+}
 
+do_stage() {
+    install -m 0755 bin/moc ${STAGING_BINDIR}
+    install -m 0755 bin/uic ${STAGING_BINDIR}
 }
diff --git a/uicmoc/uicmoc3_native_3.3.2.oe b/uicmoc/uicmoc3_native_3.3.2.oe
index f701ecb5bb..41dbb3581b 100644
--- a/uicmoc/uicmoc3_native_3.3.2.oe
+++ b/uicmoc/uicmoc3_native_3.3.2.oe
@@ -5,22 +5,26 @@ LICENSE = "GPL/QPL"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.2.tar.bz2 \
 	   file://${FILESDIR}/no-examples.patch;patch=1"
+
 S = "${WORKDIR}/qt-embedded-free-3.3.2"
 
-inherit native
+inherit native qmake-base
 
 export QTDIR = "${S}"
-export SYSCONF_CXX = "${CCACHE} g++"
-export SYSCONF_CC  = "${CCACHE} gcc"
-export SYSCONF_LINK  = "${CCACHE} g++"
-export QMAKESPEC = ""
-ARCH_i686 = "x86"
 
-QT_CONFIG_FLAGS = "-release -static -depths 8,16 -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xshape -no-xinerama -no-xcursor -no-xrandr \
-                   -no-xrender -no-xft -no-tablet -no-xkb -no-dlopen-opengl -no-freetype -no-thread -no-nis -no-cups"
+CXXFLAGS += " -DQWS"
+
+QT_CONFIG_FLAGS = "-release -static -depths 8,16 -qt-zlib -no-nas-sound \
+                   -no-sm -qt-libpng -no-gif -no-xshape -no-xinerama \
+                   -no-xcursor -no-xrandr -no-xrender -no-xft -no-tablet \
+                   -no-xkb -no-dlopen-opengl -no-freetype -no-thread \
+                   -no-nis -no-cups -prefix ${prefix} \
+                   -xplatform ${OE_QMAKE_PLATFORM} \
+                   -platform ${OE_QMAKE_PLATFORM}"
 
 do_configure() {
-	echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS}
+    oe_qmake_mkspecs
+    echo "yes" | ./configure ${QT_CONFIG_FLAGS}
 }
 
 do_stage() {