qmake2 native: update to 4.4.1 and fix builds from scratch

4 files changed, 42 insertions, 87 deletions

diff --git a/packages/qmake/files/0001-fix-mkspecs.patch b/packages/qmake/files/0001-fix-mkspecs.patch
index e0ebe512c8..c6f55906bc 100644
--- a/packages/qmake/files/0001-fix-mkspecs.patch
+++ b/packages/qmake/files/0001-fix-mkspecs.patch
@@ -1,25 +1,13 @@
-From aa0377910cfd8d0fce6bdc9355994a4e267b1696 Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Sat, 2 Jun 2007 16:39:58 +0200
-Subject: [PATCH] fix mkspecs
-
----
- mkspecs/common/g++.conf   |   18 +++++++++---------
- mkspecs/common/linux.conf |   26 +++++++++++++-------------
- 2 files changed, 22 insertions(+), 22 deletions(-)
-
-Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf
-===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf	2007-12-04 18:07:53.000000000 +0100
-+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf	2007-12-26 19:47:02.000000000 +0100
+--- /tmp/g++.conf	2008-07-08 10:32:18.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/g++.conf	2008-07-08 10:34:15.000000000 +0200
 @@ -2,12 +2,12 @@
  # qmake configuration for common gcc
  #
  
 -QMAKE_CC		= gcc
 -QMAKE_CFLAGS		+= -pipe
-+QMAKE_CC		= $(OE_QMAKE_CC)
-+QMAKE_CFLAGS		+= -pipe $(OE_QMAKE_CFLAGS)
++QMAKE_CC       = $(OE_QMAKE_CC)
++QMAKE_CFLAGS       += -pipe $(OE_QMAKE_CFLAGS)
  QMAKE_CFLAGS_DEPS	+= -M
  QMAKE_CFLAGS_WARN_ON	+= -Wall -W
  QMAKE_CFLAGS_WARN_OFF	+= -w
@@ -34,8 +22,8 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf
  
 -QMAKE_CXX		= g++
 -QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS
-+QMAKE_CXX		= $(OE_QMAKE_CXX)
-+QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
++QMAKE_CXX      = $(OE_QMAKE_CXX)
++QMAKE_CXXFLAGS     += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
  QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
  QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
  QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
@@ -46,26 +34,24 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf
 -QMAKE_LINK		= g++
 -QMAKE_LINK_SHLIB	= g++
 -QMAKE_LFLAGS		+=
-+QMAKE_LINK		= $(OE_QMAKE_LINK)
-+QMAKE_LINK_SHLIB	= $(OE_QMAKE_LINK)
-+QMAKE_LFLAGS		+= $(OE_QMAKE_LDFLAGS)
++QMAKE_LINK     = $(OE_QMAKE_LINK)
++QMAKE_LINK_SHLIB   = $(OE_QMAKE_LINK)
++QMAKE_LFLAGS       += $(OE_QMAKE_LDFLAGS)
  QMAKE_LFLAGS_RELEASE	+=
  QMAKE_LFLAGS_DEBUG	+=
  QMAKE_LFLAGS_APP	+=
-@@ -40,7 +40,7 @@
- QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
+@@ -41,7 +41,7 @@
  QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
  QMAKE_LFLAGS_THREAD	+=
+ QMAKE_LFLAGS_NOUNDEF	+= -Wl,--no-undefined
 -QMAKE_RPATH		= -Wl,-rpath,
-+QMAKE_RPATH		= -Wl,-rpath-link,
++QMAKE_RPATH        = -Wl,-rpath-link,
  
  QMAKE_PCH_OUTPUT_EXT    = .gch
  
-Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf
-===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf	2007-12-04 18:07:53.000000000 +0100
-+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf	2007-12-26 19:47:02.000000000 +0100
-@@ -7,26 +7,26 @@
+--- /tmp/linux.conf	2008-07-08 10:32:18.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/linux.conf	2008-07-08 10:38:37.000000000 +0200
+@@ -7,26 +7,27 @@
  
  QMAKE_INCDIR          =
  QMAKE_LIBDIR          =
@@ -75,12 +61,13 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf
 -QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 -QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
 -QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
-+QMAKE_INCDIR_X11      = 
-+QMAKE_LIBDIR_X11      = 
++QMAKE_INCDIR_X11      =
++QMAKE_LIBDIR_X11      =
 +QMAKE_INCDIR_QT       = $(OE_QMAKE_INCDIR_QT)
 +QMAKE_LIBDIR_QT       = $(OE_QMAKE_LIBDIR_QT)
-+QMAKE_INCDIR_OPENGL   = 
-+QMAKE_LIBDIR_OPENGL   = 
++QMAKE_INCDIR_OPENGL   =
++QMAKE_LIBDIR_OPENGL   =
++
  
  QMAKE_LIBS            =
  QMAKE_LIBS_DYNLOAD    = -ldl
@@ -100,10 +87,10 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf
  
 -QMAKE_AR              = ar cqs
 +QMAKE_AR              = $(OE_QMAKE_AR) cqs
+ QMAKE_OBJCOPY         = objcopy
  QMAKE_RANLIB          =
  
- QMAKE_TAR             = tar -cf
-@@ -38,11 +38,11 @@
+@@ -39,7 +40,7 @@
  QMAKE_MOVE            = mv -f
  QMAKE_DEL_FILE        = rm -f
  QMAKE_DEL_DIR         = rmdir
@@ -112,35 +99,3 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf
  QMAKE_STRIPFLAGS_LIB += --strip-unneeded
  QMAKE_CHK_DIR_EXISTS  = test -d
  QMAKE_MKDIR           = mkdir -p
- QMAKE_INSTALL_FILE    = install -m 644 -p
- QMAKE_INSTALL_PROGRAM = install -m 755 -p
- 
--include(unix.conf)
-\ No newline at end of file
-+include(unix.conf)
-Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf
-===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf	2007-12-04 18:07:53.000000000 +0100
-+++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf	2007-12-26 19:47:02.000000000 +0100
-@@ -5,7 +5,7 @@
- MAKEFILE_GENERATOR	= UNIX
- TEMPLATE		= app
- CONFIG			+= qt warn_on release incremental link_prl
--QT			+= core gui
-+QT			+= core gui $$(OE_QMAKE_EXTRA_MODULES)
- QMAKE_INCREMENTAL_STYLE = sublib
- 
- include(../common/g++.conf)
-Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf
-===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/unix.conf	2007-12-26 19:48:20.000000000 +0100
-+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf	2007-12-26 19:49:50.000000000 +0100
-@@ -10,6 +10,8 @@
- QMAKE_YACC_HEADER       = $base.tab.h
- QMAKE_YACC_SOURCE       = $base.tab.c
- 
-+QMAKE_RCC               = $$(OE_QMAKE_RCC)
-+
- QMAKE_SEPARATE_DEBUG_INFO = (test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; objcopy --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && objcopy --strip-debug \"\$\$targ\" && objcopy --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" ) ;
- 
- QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z "$(DESTDIR)" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/
diff --git a/packages/qmake/files/qt-config.patch b/packages/qmake/files/qt-config.patch
index b2d86de2c5..3aa041aa51 100644
--- a/packages/qmake/files/qt-config.patch
+++ b/packages/qmake/files/qt-config.patch
@@ -1,20 +1,14 @@
-Allow to set a qt.conf from the outside using the environment. This allows
-to inject new prefixes and other paths into qmake. This is needed when using
-the same qmake binary to build qt/x11 and qt/embedded
-
-Index: qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp
-===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/src/corelib/global/qlibraryinfo.cpp	2007-12-25 00:55:32.000000000 +0100
-+++ qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp	2007-12-25 01:20:18.000000000 +0100
-@@ -42,6 +42,7 @@
- #include "qpointer.h"
- #ifdef QT_BUILD_QMAKE
+--- /tmp/qlibraryinfo.cpp	2008-08-02 17:16:41.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp	2008-08-02 17:17:42.000000000 +0200
+@@ -47,6 +47,7 @@
+ QT_BEGIN_NAMESPACE
  extern QString qmake_libraryInfoFile();
+ QT_END_NAMESPACE
 +#include <stdlib.h>
  #else
  # include "qcoreapplication.h"
  #endif
-@@ -107,6 +108,10 @@
+@@ -113,6 +114,10 @@
  #ifdef QT_BUILD_QMAKE
      if(!QFile::exists(qtconfig))
          qtconfig = qmake_libraryInfoFile();
diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc
index f7bdd7836b..642adf874a 100644
--- a/packages/qmake/qmake2-native.inc
+++ b/packages/qmake/qmake2-native.inc
@@ -3,13 +3,15 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
-QTVER = "qtopia-core-opensource-src-${QTVERSION}"
+# We call 'moc' during the build 
+DEPENDS = "uicmoc4-native"
 
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.gz \
+QTVER = "qt-embedded-linux-opensource-src-${QTVERSION}"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \
            file://0001-fix-mkspecs.patch;patch=1 \
-           file://0008-backport-qt-lib-infix.patch;patch=1 \
            file://qt-config.patch;patch=1 \
            file://use-lflags-last.patch;patch=1 \
            file://linux-oe-qmake.conf"
@@ -23,6 +25,8 @@ export QTDIR = "${S}"
 EXTRA_OEMAKE = "-e"
 
 do_configure() {
+    # Make sure we regenerate all Makefiles 
+    find ${S} -name "Makefile" | xargs rm
     # Install the OE build templates
     for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
     do
@@ -43,8 +47,9 @@ do_configure() {
     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_UIC="${STAGING_BINDIR_NATIVE}/uic4"
+    export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4"
+    export QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4"
     export OE_QMAKE_RCC="non-existant"
     export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
     export OE_QMAKE_RPATH="-Wl,-rpath-link,"
diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb
index 0e1aa2c61e..42b24105d8 100644
--- a/packages/qmake/qmake2-native_2.10a.bb
+++ b/packages/qmake/qmake2-native_2.10a.bb
@@ -1,9 +1,10 @@
-QTVERSION="4.3.3"
+QTVERSION="4.4.1"
 FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
-require ${PN}.inc
 
 inherit cross
 
+require ${PN}.inc
+
 do_install() {
     :
 }