Qt3 Native builds:

    -Add a qt3e.bbclass similiar to the x11 bbclasses for Qt
    -Use this class in uicmoc3-native, opie-lrelease-native,
     opie-lupdate-native
    -Stage the headers of uicmoc3 and the static library to
     a dedicated qt3e staging directory
    -Add two .inc files to share common data between the cvs
     and 1.2.0 bbfile of opie-lupdate and opie-lrelease

8 files changed, 64 insertions, 74 deletions

diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass
new file mode 100644
index 0000000000..c34d7c04f5
--- /dev/null
+++ b/classes/qt3e.bbclass
@@ -0,0 +1,11 @@
+#
+# override variables set by qmake-base to compile Qt/X11 apps
+#
+export QTDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
+export QTEDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
+export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3"
+export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3"
+export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
+export OE_QMAKE_INCDIR_QT="${QTEDIR}/include"
+export OE_QMAKE_LIBDIR_QT="${QTEDIR}/lib"
+export OE_QMAKE_LIBS_QT="qte"
diff --git a/packages/opie-i18n/opie-lrelease-native.inc b/packages/opie-i18n/opie-lrelease-native.inc
new file mode 100644
index 0000000000..16d983693b
--- /dev/null
+++ b/packages/opie-i18n/opie-lrelease-native.inc
@@ -0,0 +1,17 @@
+DESCRIPTION = "Opie native i18n tool lrelease"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "uicmoc3-native"
+
+S = "${WORKDIR}/opie-lrelease"
+
+inherit native qmake qt3e
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl"
+
+do_stage() {
+	install -m 0755 opie-lrelease ${STAGING_BINDIR}/
+}
diff --git a/packages/opie-i18n/opie-lrelease-native_1.2.0.bb b/packages/opie-i18n/opie-lrelease-native_1.2.0.bb
index 17a662d957..699a72256c 100644
--- a/packages/opie-i18n/opie-lrelease-native_1.2.0.bb
+++ b/packages/opie-i18n/opie-lrelease-native_1.2.0.bb
@@ -1,21 +1,5 @@
-DESCRIPTION = "Opie native i18n tool lrelease"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "uicmoc3-native"
+include ${PN}.inc
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lrelease \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared"
-
-S = "${WORKDIR}/opie-lrelease"
-
-inherit native qmake
-
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl"
-
-do_stage() {
-	install -m 0755 opie-lrelease ${STAGING_BINDIR}/
-}
diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb
index 637746bdf3..e6809cc9da 100644
--- a/packages/opie-i18n/opie-lrelease-native_cvs.bb
+++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb
@@ -1,21 +1,5 @@
-DESCRIPTION = "Opie native i18n tool lrelease"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "uicmoc3-native"
-PV = "1.2.0+cvs-${CVSDATE}"
+include ${PN}.inc
 
+PV = "1.2.0+cvs-${CVSDATE}"
 SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \
            ${HANDHELDS_CVS};module=opie/development/translation/shared"
-
-S = "${WORKDIR}/opie-lrelease"
-
-inherit native qmake
-
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl"
-
-do_stage() {
-	install -m 0755 opie-lrelease ${STAGING_BINDIR}/
-}
diff --git a/packages/opie-i18n/opie-lupdate-native.inc b/packages/opie-i18n/opie-lupdate-native.inc
new file mode 100644
index 0000000000..98eb30a864
--- /dev/null
+++ b/packages/opie-i18n/opie-lupdate-native.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "Opie native i18n tool lupdate"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "uicmoc3-native"
+
+S = "${WORKDIR}/opie-lupdate"
+
+inherit native qmake qt3e
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl "
+EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread "
+
+do_stage() {
+	install -m 0755 opie-lupdate ${STAGING_BINDIR}/
+}
diff --git a/packages/opie-i18n/opie-lupdate-native_1.2.0.bb b/packages/opie-i18n/opie-lupdate-native_1.2.0.bb
index 29076a4bd7..d4e7f18284 100644
--- a/packages/opie-i18n/opie-lupdate-native_1.2.0.bb
+++ b/packages/opie-i18n/opie-lupdate-native_1.2.0.bb
@@ -1,22 +1,6 @@
-DESCRIPTION = "Opie native i18n tool lupdate"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "uicmoc3-native"
+include ${PN}.inc
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lupdate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared"
 
-S = "${WORKDIR}/opie-lupdate"
-
-inherit native qmake
-
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl "
-EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread "
-
-do_stage() {
-	install -m 0755 opie-lupdate ${STAGING_BINDIR}/
-}
diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb
index acc15176d0..57fba3893e 100644
--- a/packages/opie-i18n/opie-lupdate-native_cvs.bb
+++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb
@@ -1,22 +1,5 @@
-DESCRIPTION = "Opie native i18n tool lupdate"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "uicmoc3-native"
-PV = "1.2.0+cvs-${CVSDATE}"
+include ${PN}.inc
 
+PV      = "1.2.0+cvs-${CVSDATE}"
 SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \
            ${HANDHELDS_CVS};module=opie/development/translation/shared"
-
-S = "${WORKDIR}/opie-lupdate"
-
-inherit native qmake
-
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl "
-EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread "
-
-do_stage() {
-	install -m 0755 opie-lupdate ${STAGING_BINDIR}/
-}
diff --git a/packages/uicmoc/uicmoc3-native_3.3.2.bb b/packages/uicmoc/uicmoc3-native_3.3.2.bb
index 582fbe80ef..3871c80c04 100644
--- a/packages/uicmoc/uicmoc3-native_3.3.2.bb
+++ b/packages/uicmoc/uicmoc3-native_3.3.2.bb
@@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.2.tar.bz2 \
 
 S = "${WORKDIR}/qt-embedded-free-3.3.2"
 
-inherit native qmake-base
+inherit native qmake-base qt3e
 
 export QTDIR = "${S}"
 export OE_QMAKE_LINK="${CXX}"
@@ -28,6 +28,15 @@ do_configure() {
 }
 
 do_stage() {
-	install -m 0755 bin/moc ${STAGING_BINDIR}/moc3
-	install -m 0755 bin/uic ${STAGING_BINDIR}/uic3
+	install -d ${OE_QMAKE_INCDIR_QT}
+	install -d ${OE_QMAKE_LIBDIR_QT}
+
+	install -m 0755 bin/moc ${OE_QMAKE_UIC}
+	install -m 0755 bin/uic ${OE_QMAKE_MOC}
+	install -m 0655 lib/*.a ${OE_QMAKE_LIBDIR_QT}
+
+	for f in include/*.h
+	do
+		install -m 0644 $f ${OE_QMAKE_INCDIR_QT}/
+	done
 }