templated qmake support (to allow uclibc builds), also update mtd

BKrev: 409d6796_U-R5ieZHQVcqDkv7KMpBw

diff --git a/gnuboy/qtopiagnuboy_1.0.3.oe b/gnuboy/qtopiagnuboy_1.0.3.oe
index ae738dd..640226e 100644 (file)
--- a/gnuboy/qtopiagnuboy_1.0.3.oe
+++ b/gnuboy/qtopiagnuboy_1.0.3.oe
@@ -12,7 +12,7 @@ FILES = ""
 FILES_${PN} = "${palmtopdir}/"
 
 QMAKE = "${STAGING_BINDIR}/qmake"
-QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++"
+QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/${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/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe
index e90db46..f8fd840 100644 (file)
--- a/libopie/libopie2_cvs.oe
+++ b/libopie/libopie2_cvs.oe
@@ -22,11 +22,6 @@ EXTRA_QMAKEVARS_POST = ' DEFINES+=OPIE_NEW_MALLOC    \
                          DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \
                          DEFINES+="OPIE_WE_VERSION=15" '
 
-#
-# for developing - qmake.oeclass should gather this automatically
-#
-export QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/linux-sharp-g++"
-
 do_compile() {
        install -d ${STAGING_INCDIR}/opie2
        for i in `find . -name "*.h"`

diff --git a/libqpe/libqpe-opie_cvs.oe b/libqpe/libqpe-opie_cvs.oe
index 5e0efdf..5e90ccc 100644 (file)
--- a/libqpe/libqpe-opie_cvs.oe
+++ b/libqpe/libqpe-opie_cvs.oe
@@ -19,11 +19,6 @@ export OPIEDIR = "${STAGING_LIBDIR}/.."
 
 CXXFLAGS_append = " -DQWS -fno-rtti -fno-exceptions"
 
-#
-# for developing - qmake.oeclass should gather this automatically
-#
-export QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/linux-sharp-g++"
-
 do_compile() {
         mkdir -p ${STAGING_INCDIR}/qpe \
                  ${STAGING_INCDIR}/qtopia \

diff --git a/mtd/mtd-native.oe b/mtd/mtd-native.oe
index ed32e7e..2fbdc49 100644 (file)
--- a/mtd/mtd-native.oe
+++ b/mtd/mtd-native.oe
@@ -4,9 +4,9 @@ DEPENDS = "patcher-native zlib-native"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/mtd"
 
 do_stage () {
-       for binary in ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
-               mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
-               flashcp nandwrite jffs2dump; do
+       for binary in ftl_format erase eraseall nanddump doc_loadbios \
+               mkfs.jffs ftl_check mkfs.jffs2 lock unlock einfo mtd_debug \
+               fcp nandwrite jffs2dump; do
                install -m 0755 util/$binary ${STAGING_BINDIR}/
        done
 }

diff --git a/mtd/mtd.oe b/mtd/mtd.oe
index 6ded9d3..c6a11b5 100644 (file)
--- a/mtd/mtd.oe
+++ b/mtd/mtd.oe
@@ -15,9 +15,9 @@ do_compile () {
 
 do_install () {
        install -d ${D}${bindir}
-       for binary in ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
-               mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
-               flashcp nandwrite jffs2dump; do
+       for binary in ftl_format erase eraseall nanddump doc_loadbios \
+               mkfs.jffs ftl_check mkfs.jffs2 lock unlock einfo mtd_debug \
+               fcp nandwrite jffs2dump; do
                install -m 0755 util/$binary ${D}${bindir}
        done
 }

diff --git a/opie-i18n/opie-lrelease-native_cvs.oe b/opie-i18n/opie-lrelease-native_cvs.oe
index 5a6d93d..8333940 100644 (file)
--- a/opie-i18n/opie-lrelease-native_cvs.oe
+++ b/opie-i18n/opie-lrelease-native_cvs.oe
@@ -14,7 +14,7 @@ S = "${WORKDIR}/opie-lrelease"
 inherit native
 
 do_configure() {
-       QMAKESPEC="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++" 
+       QMAKESPEC="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-oe-g++" 
        qmake -makefile -spec $QMAKESPEC -o Makefile lrelease.pro
 }
 

diff --git a/opie-i18n/opie-lupdate-native_cvs.oe b/opie-i18n/opie-lupdate-native_cvs.oe
index bceda6c..2e433d4 100644 (file)
--- a/opie-i18n/opie-lupdate-native_cvs.oe
+++ b/opie-i18n/opie-lupdate-native_cvs.oe
@@ -14,7 +14,7 @@ S = "${WORKDIR}/opie-lupdate"
 inherit native
 
 do_configure() {
-       QMAKESPEC="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++" 
+       QMAKESPEC="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-oe-g++" 
        qmake -makefile -spec $QMAKESPEC -o Makefile opie-lupdate.pro
 }
 

diff --git a/python/python-pyqt_3.11.oe b/python/python-pyqt_3.11.oe
index 60ce94c..cab48a2 100644 (file)
--- a/python/python-pyqt_3.11.oe
+++ b/python/python-pyqt_3.11.oe
@@ -28,7 +28,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}-${TARGET_ARCH}-g++"
+QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/${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 db2c942..645a585 100644 (file)
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -27,7 +27,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}-${TARGET_ARCH}-g++"
+QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-oe-g++"
 
 MODULES = "qwt"
 

diff --git a/qmake/qmake-native-3.2.3/linux-oe-g++/qmake.conf b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
similarity index 100%
rename from qmake/qmake-native-3.2.3/linux-oe-g++/qmake.conf
rename to qmake/qmake-native-3.2.3/linux-oe-qmake.conf

diff --git a/qmake/qmake-native-3.2.3/linux-oe-g++/qplatformdefs.h b/qmake/qmake-native-3.2.3/linux-oe-qplatformdefs.h
similarity index 100%
rename from qmake/qmake-native-3.2.3/linux-oe-g++/qplatformdefs.h
rename to qmake/qmake-native-3.2.3/linux-oe-qplatformdefs.h

diff --git a/qmake/qmake-native_3.2.3.oe b/qmake/qmake-native_3.2.3.oe
index 692537c..381c09b 100644 (file)
--- a/qmake/qmake-native_3.2.3.oe
+++ b/qmake/qmake-native_3.2.3.oe
@@ -3,36 +3,55 @@ PRIORITY = "optional"
 DEPENDS = "virtual/libc"
 LICENSE = "GPL/QPL"
 
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2"
+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"
+
 S = "${WORKDIR}/qt-embedded-free-${PV}"
 
 inherit autotools native
 
 export QTDIR = "${S}"
 
-ARCH_i686 = "x86"
-
-EXTRA_OECONF = "-static -no-gif -no-sm -system-zlib -system-libjpeg -system-libpng -no-thread -no-nis -no-cups -no-stl \
-                -disable-styles -disable-tools -disable-kernel -disable-widgets -disable-dialogs -disable-iconview \
-                -disable-workspace -disable-network -disable-canvas -disable-table -disable-xml -disable-opengl -disable-sql"
+EXTRA_OECONF = "-static -no-gif -no-sm -system-zlib -system-libjpeg \
+       -system-libpng -no-thread -no-nis -no-cups -no-stl -disable-styles \
+       -disable-tools -disable-kernel -disable-widgets -disable-dialogs \
+       -disable-iconview -disable-workspace -disable-network -disable-canvas \
+       -disable-table -disable-xml -disable-opengl -disable-sql"
 EXTRA_OEMAKE = "-e"
 
 do_configure() {
-        oenote ./configure ${EXTRA_OECONF}
-        echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
+       # 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 -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
+       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
+
+       QMAKESPEC=
+       PLATFORM=${HOST_OS}-oe-g++
+       export PLATFORM
+       oenote ./configure ${EXTRA_OECONF}
+       echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
 }
 
 do_compile() {
-       sleep 1
+       :
 }
 
 do_stage() {
-        install -m 0755 bin/qmake ${STAGING_BINDIR}
+       install -m 0755 bin/qmake ${STAGING_BINDIR}
        install -d ${QMAKE_MKSPEC_PATH}
        cp -dfR mkspecs/* ${QMAKE_MKSPEC_PATH}
 }
 
 do_install() {
-        sleep 1
+        :
 }