From b4239eb6c8606bab1331dcb003f392039c80802c Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 8 Jan 2004 15:02:16 +0000
Subject: fix qte builds to work with uicmoc

BKrev: 3ffd70f8LYVOFHlPIw6cehuhSbQnqw
---
 qte/qte_2.3.7.oe | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'qte/qte_2.3.7.oe')

diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index 606e4ced1e..815622e6a6 100644
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -3,7 +3,8 @@ LICENSE="GPL/QPL"
 SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \
 	 file://${FILESDIR}/qpe.patch;patch=1 \
 	 file://${FILESDIR}/tslib.patch;patch=1 \
-	 file://${FILESDIR}/devfs.patch;patch=1"
+	 file://${FILESDIR}/devfs.patch;patch=1 \
+	 file://${FILESDIR}/no-moc.patch;patch=1 "
 DEPENDS=virtual/libc base/zlib base/libpng base/jpeg
 PROVIDES=virtual/qte virtual/libqte2
 S="${WORKDIR}/qt-${PV}"
@@ -37,6 +38,8 @@ export SYSCONF_SHLIB = ${CCLD}
 export SYSCONF_CFLAGS = ${CFLAGS}
 export SYSCONF_CXXFLAGS = ${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG
 export SYSCONF_LFLAGS = ${LDFLAGS}
+export SYSCONF_MOC = ${STAGING_BINDIR}/moc
+export SYSCONF_UIC = ${STAGING_BINDIR}/uic
 
 do_configure() {
 	if [ "$BUILD_ARCH" = "i686" ]; then
@@ -47,15 +50,6 @@ do_configure() {
 
 do_compile() {
 	unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
-	(
-		cd src/moc
-		export SYSCONF_CXX="${BUILD_CXX}"
-		export SYSCONF_CC="${BUILD_CC}"
-		export SYSCONF_LINK="${BUILD_CCLD}"
-		export SYSCONF_SHLIB="${BUILD_CC}"
-		unset SYSCONF_CFLAGS SYSCONF_CXXFLAGS SYSCONF_LFLAGS
-		oe_runmake
-	) || die "Building moc failed"
 	oe_runmake
 }
 
-- 
cgit v1.2.3