qt4-tools-native: stage mkspecs for the host platform

diff --git a/recipes/qt4/qt4-tools-native_4.4.3.bb b/recipes/qt4/qt4-tools-native_4.4.3.bb
index 4e35149..03bffcc 100644 (file)
--- a/recipes/qt4/qt4-tools-native_4.4.3.bb
+++ b/recipes/qt4/qt4-tools-native_4.4.3.bb
@@ -4,11 +4,12 @@ SECTION = "libs"
 HOMEPAGE = "http://www.trolltech.com"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 inherit native
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
+           file://0005-fix-mkspecs.patch;patch=1 \
            file://qt-config.patch;patch=1" 
 S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
 
@@ -24,14 +25,13 @@ EXTRA_OECONF = "-prefix ${prefix} \
                 -no-libpng                       \
                 -verbose -release  -fast -static \
                 -qt3support "
-# yank default -e
+
+# yank default -e, otherwise we get the following error:
+# moc_qbuffer.cpp: No such file or directory
 EXTRA_OEMAKE = " "
 
 do_configure() {
-    # Make sure we regenerate all Makefiles
-    find ${S} -name "Makefile" | xargs rm
-
-    sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
+    ln -s linux-g++ mkspecs/${BUILD_OS}-oe-g++
     echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }
 
@@ -57,13 +57,13 @@ do_compile() {
 }
 
 do_stage() {
-       install -d ${STAGING_BINDIR}/
-    install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2
-    ln -sf qmake2 ${STAGING_BINDIR}/qmake-qt4
+       install -d ${STAGING_BINDIR_NATIVE}/
+    install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
     for i in moc uic uic3 rcc lrelease lupdate; do
-        install -m 0755 bin/${i} ${STAGING_BINDIR}/${i}4
+        install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4
     done
     install -d ${STAGING_DATADIR_NATIVE}/qt4/
     cp -PfR mkspecs ${STAGING_DATADIR_NATIVE}/qt4/
     install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DATADIR_NATIVE}/qt4/
 }
+