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

diff --git a/gnuboy/qtopiagnuboy_1.0.3.oe b/gnuboy/qtopiagnuboy_1.0.3.oe
index 640226e..b9c3acc 100644 (file)
--- a/gnuboy/qtopiagnuboy_1.0.3.oe
+++ b/gnuboy/qtopiagnuboy_1.0.3.oe
@@ -11,8 +11,13 @@ S = "${WORKDIR}/gnuboy"
 FILES = ""
 FILES_${PN} = "${palmtopdir}/"
 
+#
+# FIXME - This should be updated to use OE's qmake-base.oeclass
+#         or the full qmake.oeclass.
+#
+
 QMAKE = "${STAGING_BINDIR}/qmake"
-QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-oe-g++"
+QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++"
 EXTRA_QMAKEVARS_POST = "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link,"
 qtopiadir = "${S}/gnuboy-${PV}-qtopia2"
 

diff --git a/python/python-pyqt_3.11.oe b/python/python-pyqt_3.11.oe
index 1c69dec..e7373d9 100644 (file)
--- a/python/python-pyqt_3.11.oe
+++ b/python/python-pyqt_3.11.oe
@@ -11,7 +11,10 @@ SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz"
 
 S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
 
-inherit qmake
+#
+# FIXME - This should be updated to use OE's qmake-base.oeclass
+#         or the full qmake.oeclass.
+#
 
 export QTDIR = "${STAGING_LIBDIR}/.."
 
@@ -28,7 +31,7 @@ EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BIN
 PYTHON = "${STAGING_BINDIR}/python"
 SIP = "${STAGING_BINDIR}/sip"
 QMAKE = "${STAGING_BINDIR}/qmake"
-QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-oe-g++"
+QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++"
 
 MODULES = "qt qtcanvas qttable qtpe"
 

diff --git a/python/python-pyqwt_3.10.oe b/python/python-pyqwt_3.10.oe
index f75ab69..3cad604 100644 (file)
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -12,6 +12,11 @@ SRC_URI = "http://pyqwt.sourceforge.net/snapshot/PyQwt-20040118.tar.gz \
            file://${FILESDIR}/qtmod-sip-staging.patch;patch=1"
 S = "${WORKDIR}/PyQwt-20040118"
 
+#
+# FIXME - This should be updated to use OE's qmake-base.oeclass
+#         or the full qmake.oeclass.
+#
+
 export QTDIR = "${STAGING_LIBDIR}/.."
 
 EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
@@ -27,7 +32,7 @@ EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BIN
 PYTHON = "${STAGING_BINDIR}/python"
 SIP = "${STAGING_BINDIR}/sip"
 QMAKE = "${STAGING_BINDIR}/qmake"
-QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-oe-g++"
+QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++"
 
 MODULES = "qwt"
 

diff --git a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
index c469416..9dfb26a 100644 (file)
--- a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
+++ b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
@@ -6,12 +6,12 @@ MAKEFILE_GENERATOR    = UNIX
 TEMPLATE               = app
 CONFIG                 += qt warn_on release
 
-QMAKE_CC               = $(OECC)
+QMAKE_CC               = $(OE_QMAKE_CC)
 QMAKE_LEX              = flex
 QMAKE_LEXFLAGS         =
 QMAKE_YACC             = yacc
 QMAKE_YACCFLAGS                = -d
-QMAKE_CFLAGS           = -pipe $(OECFLAGS) $(CFLAGS_EXTRA)
+QMAKE_CFLAGS           = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON   = -Wall -W
 QMAKE_CFLAGS_WARN_OFF  =
 QMAKE_CFLAGS_RELEASE   = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
@@ -20,8 +20,8 @@ QMAKE_CFLAGS_SHLIB    = -fPIC
 QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD    = -D_REENTRANT
 
-QMAKE_CXX              = $(OECXX)
-QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(OECXXFLAGS) $(CXXFLAGS_EXTRA)
+QMAKE_CXX              = $(OE_QMAKE_CXX)
+QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA)
 QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF        = $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
@@ -34,14 +34,14 @@ QMAKE_INCDIR                =
 QMAKE_LIBDIR           =
 QMAKE_INCDIR_X11       = 
 QMAKE_LIBDIR_X11       = 
-QMAKE_INCDIR_QT                = $(QTDIR)/include
-QMAKE_LIBDIR_QT                = $(QTDIR)/lib
+QMAKE_INCDIR_QT                = $(OE_QMAKE_INCDIR)
+QMAKE_LIBDIR_QT                = $(OE_QMAKE_LIBDIR)
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 
 QMAKE_LINK             = $(CXX)
 QMAKE_LINK_SHLIB       = $(CXX)
-QMAKE_LFLAGS           = $(OELDFLAGS) $(LFLAGS_EXTRA)
+QMAKE_LFLAGS           = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE   =
 QMAKE_LFLAGS_DEBUG     =
 QMAKE_LFLAGS_SHLIB      = -shared
@@ -59,10 +59,10 @@ QMAKE_LIBS_QT_THREAD    = -lqte-mt
 QMAKE_LIBS_QT_OPENGL   = -lqgl
 QMAKE_LIBS_THREAD       = -lpthread
 
-QMAKE_MOC              = $(QTDIR)/bin/moc
-QMAKE_UIC              = $(QTDIR)/bin/uic
+QMAKE_MOC              = $(OE_QMAKE_MOC)
+QMAKE_UIC              = $(OE_QMAKE_UIC)
 
-QMAKE_AR               = $(OEAR) cqs
+QMAKE_AR               = $(OE_QMAKE_AR) cqs
 QMAKE_RANLIB           =
 
 QMAKE_TAR              = tar -cf
@@ -74,7 +74,8 @@ QMAKE_COPY_DIR          = $(COPY) -r
 QMAKE_MOVE             = mv -f
 QMAKE_DEL_FILE         = rm -f
 QMAKE_DEL_DIR          = rmdir
-QMAKE_STRIP             = $(OESTRIP)
+QMAKE_STRIP             = $(OE_QMAKE_STRIP)
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 QMAKE_CHK_DIR_EXISTS   = test -d
 QMAKE_MKDIR            = mkdir -p
+

diff --git a/qmake/qmake-native-3.2.3/linux-oe-qplatformdefs.h b/qmake/qmake-native-3.2.3/linux-oe-qplatformdefs.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qmake/qmake-native_3.2.3.oe b/qmake/qmake-native_3.2.3.oe
index 381c09b..da48f55 100644 (file)
--- a/qmake/qmake-native_3.2.3.oe
+++ b/qmake/qmake-native_3.2.3.oe
@@ -5,8 +5,7 @@ LICENSE = "GPL/QPL"
 
 SRC_URI = \
        "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2 \
-       file://${FILESDIR}/linux-oe-qmake.conf \
-       file://${FILESDIR}/linux-oe-qplatformdefs.h"
+       file://${FILESDIR}/linux-oe-qmake.conf"
 
 S = "${WORKDIR}/qt-embedded-free-${PV}"
 
@@ -23,16 +22,16 @@ EXTRA_OEMAKE = "-e"
 
 do_configure() {
        # Install the OE build templates (linux, linux-uclibc)
-       install -d ${S}/mkspecs/qws/linux-oe-g++
-       install -d ${S}/mkspecs/qws/linux-uclibc-oe-g++
+       install -d ${S}/mkspecs/linux-oe-g++
+       install -d ${S}/mkspecs/linux-uclibc-oe-g++
        install -m 0644 ${WORKDIR}/linux-oe-qmake.conf \
-               ${S}/mkspecs/qws/linux-oe-g++/qmake.conf
-       ln -s ../../linux-g++/qplatformdefs.h \
-               ${S}/mkspecs/qws/linux-oe-g++/qplatformdefs.h
+               ${S}/mkspecs/linux-oe-g++/qmake.conf
+       ln -s ../linux-g++/qplatformdefs.h \
+               ${S}/mkspecs/linux-oe-g++/qplatformdefs.h
        ln -s ../linux-oe-g++/qmake.conf \
-               ${S}/mkspecs/qws/linux-uclibc-oe-g++/qmake.conf
-       ln -s ../../linux-g++/qplatformdefs.h \
-               ${S}/mkspecs/qws/linux-uclibc-oe-g++/qplatformdefs.h
+               ${S}/mkspecs/linux-uclibc-oe-g++/qmake.conf
+       ln -s ../linux-g++/qplatformdefs.h \
+               ${S}/mkspecs/linux-uclibc-oe-g++/qplatformdefs.h
 
        QMAKESPEC=
        PLATFORM=${HOST_OS}-oe-g++

diff --git a/qt/qt-x11-free_3.3.2.oe b/qt/qt-x11-free_3.3.2.oe
index e69de29..dff4e3b 100644 (file)
--- a/qt/qt-x11-free_3.3.2.oe
+++ b/qt/qt-x11-free_3.3.2.oe
@@ -0,0 +1,48 @@
+DESCRIPTION = "Qt/X11 Version ${PV}"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL/QPL"
+DEPENDS = "qmake-native x11"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+          file://${FILESDIR}/no-examples.patch;patch=1"
+S = "${WORKDIR}/qt-x11-free-${PV}"
+
+#
+# FIXME - This should be updated to use OE's qmake-base.oeclass
+#         or the full qmake.oeclass.
+#
+
+export QTDIR = "${S}"
+export SYSCONF_CXX = "${CCACHE} g++"
+export SYSCONF_CC  = "${CCACHE} gcc"
+export SYSCONF_LINK  = "${CCACHE} g++"
+THIS_QMAKESPEC = "${STAGING_DATADIR}/qmake/${TAGET_OS}-oe-g++"
+export QMAKESPEC = ""
+ARCH_i686 = "x86"
+
+QT_CONFIG_FLAGS = "-release -shared -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"
+
+do_configure() {
+       echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast
+}
+
+do_compile() {
+       LD_LIBRARY_PATH=${S}/lib oe_runmake \
+               QMAKE="${STAGING_BINDIR}/qmake -after INCLUDEPATH+=${STAGING_INCDIR} LIBS+=-I${STAGING_LIBDIR}" \
+               QMAKESPEC="${THIS_QMAKESPEC}"
+}
+
+do_stage() {
+       oe_soinstall lib/libqt.so.${PV} ${STAGING_LIBDIR}/
+       for f in include/*.h
+       do
+               install -m 0644 $f ${STAGING_INCDIR}/
+       done
+}
+
+do_install() {
+       install -d ${D}/${libdir}/
+       oe_soinstall lib/libqt.so.${PV} ${D}/{libdir}/
+}

diff --git a/uicmoc/uicmoc-native_2.3.7.oe b/uicmoc/uicmoc-native_2.3.7.oe
index d3d61ed..827d555 100644 (file)
--- 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 f701ecb..41dbb35 100644 (file)
--- 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() {