merge of '603b2d0c7e4ad80e5779bd3bbdb822331cc0ea2b'

     and '6ab53da82d157971966f5a17d0c29d54df22cac9'

1 files changed, 66 insertions, 0 deletions

diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb
new file mode 100644
index 0000000000..207aaaf9b5
--- /dev/null
+++ b/packages/qmake/qmake2-native_2.10a.bb
@@ -0,0 +1,66 @@
+DESCRIPTION = "TrollTech Makefile Generator"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+SECTION = "devel"
+LICENSE = "GPL"
+PR = "r0"
+
+QTVER = "qtopia-core-opensource-src-4.3.1"
+
+SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
+           file://0001-fix-mkspecs.patch;patch=1 \
+           file://linux-oe-qmake.conf"
+S = "${WORKDIR}/${QTVER}"
+
+# we need the real target system here
+CROSS_SYS := "${TARGET_SYS}"
+inherit autotools native
+
+export QTDIR = "${S}"
+EXTRA_OEMAKE = "-e"
+
+do_configure() {
+        # Install the OE build templates
+        for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
+        do
+                install -d ${S}/mkspecs/$template
+                install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
+                ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
+        done
+
+	QMAKESPEC=
+	PLATFORM=${HOST_OS}-oe-g++
+	export PLATFORM
+	# yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M:
+	export OE_QMAKE_CC="${CC}"
+	export OE_QMAKE_CFLAGS="${CFLAGS}"
+	export OE_QMAKE_CXX="${CXX}"
+	export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
+	export OE_QMAKE_LDFLAGS="${LDFLAGS}"
+	export OE_QMAKE_LINK="${CCLD}"
+	export OE_QMAKE_AR="${AR}"
+	export OE_QMAKE_STRIP="${STRIP}"
+	export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
+	export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
+	export OE_QMAKE_RCC="non-existant"
+	export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
+	export OE_QMAKE_RPATH="-Wl,-rpath-link,"
+	echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
+}
+
+do_compile() {
+	:
+}
+
+do_stage() {
+	install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2
+	install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4
+	install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/
+	cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
+	install -d ${STAGING_DIR}/${HOST_SYS}/qt4/
+	cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/
+}
+
+do_install() {
+        :
+}