make opie-i18n native tools use our qmake+qmakespec

BKrev: 40a1110fG-4TbJI-4a1p-65rqpmVzg

diff --git a/opie-i18n/opie-lrelease-native_cvs.oe b/opie-i18n/opie-lrelease-native_cvs.oe
index 8333940..c921c21 100644 (file)
--- a/opie-i18n/opie-lrelease-native_cvs.oe
+++ b/opie-i18n/opie-lrelease-native_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/base"
 PRIORITY = "optional"
 MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
 LICENSE = "GPL"
-DEPENDS = "qmake-native uicmoc3-native"
+DEPENDS = "uicmoc3-native"
 PV = "1.1.4-cvs-${CVSDATE}"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/opie-lrelease;date=${CVSDATE} \
@@ -11,12 +11,9 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/t
 
 S = "${WORKDIR}/opie-lrelease"
 
-inherit native
+inherit native qmake
 
-do_configure() {
-       QMAKESPEC="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-oe-g++" 
-       qmake -makefile -spec $QMAKESPEC -o Makefile lrelease.pro
-}
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl"
 
 do_stage() {
        install -m 0755 opie-lrelease ${STAGING_BINDIR}/

diff --git a/opie-i18n/opie-lupdate-native_cvs.oe b/opie-i18n/opie-lupdate-native_cvs.oe
index 2e433d4..96fcbc1 100644 (file)
--- a/opie-i18n/opie-lupdate-native_cvs.oe
+++ b/opie-i18n/opie-lupdate-native_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/base"
 PRIORITY = "optional"
 MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
 LICENSE = "GPL"
-DEPENDS = "qmake-native uicmoc3-native"
+DEPENDS = "uicmoc3-native"
 PV = "1.1.4-cvs-${CVSDATE}"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/opie-lupdate;date=${CVSDATE} \
@@ -11,12 +11,9 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/t
 
 S = "${WORKDIR}/opie-lupdate"
 
-inherit native
+inherit native qmake
 
-do_configure() {
-       QMAKESPEC="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-oe-g++" 
-       qmake -makefile -spec $QMAKESPEC -o Makefile opie-lupdate.pro
-}
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl"
 
 do_stage() {
        install -m 0755 opie-lupdate ${STAGING_BINDIR}/

diff --git a/uicmoc/uicmoc3_native_3.3.2.oe b/uicmoc/uicmoc3_native_3.3.2.oe
index e69de29..f701ecb 100644 (file)
--- a/uicmoc/uicmoc3_native_3.3.2.oe
+++ b/uicmoc/uicmoc3_native_3.3.2.oe
@@ -0,0 +1,34 @@
+DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x"
+SECTION = "tools"
+PRIORITY = "optional"
+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
+
+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"
+
+do_configure() {
+       echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS}
+}
+
+do_stage() {
+       install -m 0755 bin/moc ${STAGING_BINDIR}/moc3
+       install -m 0755 bin/uic ${STAGING_BINDIR}/uic3
+       install -m 0655 lib/*.a ${STAGING_LIBDIR}/
+       for f in include/*.h
+       do
+               install -m 0644 $f ${STAGING_INCDIR}/
+       done
+}