From 227c10fb8b9e704a3e155da5ed3d596412ae3931 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 19 Jun 2011 20:40:34 +0200 Subject: [PATCH] qmake2: update qt from 4.4.3 to 4.7.3 (From meta-openembedded rev: bf206c9185c84b52af3f281588d850d555950473) Signed-off-by: Koen Kooi Signed-off-by: Patrick Ohly --- .../meta-oe/recipes-qt/qt4/qmake2.inc | 14 ++-- .../recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch | 82 +++++++++++++++++----- .../meta-oe/recipes-qt/qt4/qmake2_2.10a.bb | 2 +- 3 files changed, 76 insertions(+), 22 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2.inc b/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2.inc index f2631b5..d38e83e 100644 --- a/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2.inc +++ b/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2.inc @@ -2,15 +2,18 @@ DESCRIPTION = "TrollTech Makefile Generator" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" -LICENSE = "GPL" +LICENSE = "LGPLv2.1 | GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ + file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ + file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" PR = "r12" # We call 'moc' during the build DEPENDS = "qt4-tools-native" -QTVER = "qt-embedded-linux-opensource-src-${QTVERSION}" +QTVER = "qt-everywhere-opensource-src-${QTVERSION}" -SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \ +SRC_URI = "http://get.qt.nokia.com/qt/source/${QTVER}.tar.gz \ file://0001-fix-mkspecs.patch \ file://qt-config.patch \ file://use-lflags-last.patch \ @@ -34,9 +37,10 @@ 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++ linux-uclibceabi-oe-g++ + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibceabi-oe-g++ default do install -d ${S}/mkspecs/$template + rm -f ${S}/mkspecs/$template/qmake.conf 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 @@ -59,7 +63,7 @@ do_configure() { export QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4" export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" export OE_QMAKE_RPATH="-Wl,-rpath-link," - echo yes | ./configure -prefix ${STAGING_DIR_NATIVE}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" + (echo o; echo yes) | ./configure -prefix ${STAGING_DIR_NATIVE}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" } do_compile() { diff --git a/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch b/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch index 0fccb57..e36c554 100644 --- a/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch +++ b/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch @@ -1,6 +1,19 @@ ---- /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 @@ +From 04f1a1d766de39797362cd748299bd29251f6cfc Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Sun, 19 Jun 2011 19:50:05 +0200 +Subject: [PATCH] fix mkspecs for OE usage + +Signed-off-by: Koen Kooi +--- + mkspecs/common/g++.conf | 32 +++++++++++++++++++------------- + mkspecs/common/linux.conf | 33 +++++++++++++++++++-------------- + 2 files changed, 38 insertions(+), 27 deletions(-) + +diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf +index 0d511fc..80f925c 100644 +--- a/mkspecs/common/g++.conf ++++ b/mkspecs/common/g++.conf +@@ -2,13 +2,13 @@ # qmake configuration for common gcc # @@ -8,15 +21,17 @@ -QMAKE_CFLAGS += -pipe +QMAKE_CC = $(OE_QMAKE_CC) +QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) ++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += +-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g ++QMAKE_CFLAGS_RELEASE += QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += -fPIC QMAKE_CFLAGS_STATIC_LIB += -fPIC -@@ -16,8 +16,8 @@ +@@ -17,8 +17,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} @@ -27,31 +42,48 @@ QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF -@@ -30,9 +30,9 @@ +@@ -32,12 +32,12 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ +-QMAKE_LINK_C = gcc +-QMAKE_LINK_C_SHLIB = gcc -QMAKE_LFLAGS += +-QMAKE_LFLAGS_RELEASE += -Wl,-O1 +QMAKE_LINK = $(OE_QMAKE_LINK) +QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) ++QMAKE_LINK_C = $(OE_QMAKE_LINK) ++QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) +QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) - QMAKE_LFLAGS_RELEASE += ++QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += -@@ -41,7 +41,7 @@ + QMAKE_LFLAGS_SHLIB += -shared +@@ -45,10 +45,16 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined --QMAKE_RPATH = -Wl,-rpath, -+QMAKE_RPATH = -Wl,-rpath-link, +-QMAKE_LFLAGS_RPATH = -Wl,-rpath, ++QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, QMAKE_PCH_OUTPUT_EXT = .gch ---- /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,28 @@ + # -Bsymbolic-functions (ld) support + QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions + QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, ++ ++# some linking helper... ++CONFIG += rpath_libdirs ++ ++# for the SDK ++isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) +diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf +index 4fbe2dc..a541355 100644 +--- a/mkspecs/common/linux.conf ++++ b/mkspecs/common/linux.conf +@@ -7,25 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD QMAKE_INCDIR = QMAKE_LIBDIR = @@ -67,8 +99,18 @@ +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) +QMAKE_INCDIR_OPENGL = +QMAKE_LIBDIR_OPENGL = -+ + QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL + QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL +-QMAKE_INCDIR_EGL = ++QMAKE_INCDIR_EGL = + QMAKE_LIBDIR_EGL = +-QMAKE_INCDIR_OPENVG = ++QMAKE_INCDIR_OPENVG = + QMAKE_LIBDIR_OPENVG = ++ QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -lm @@ -76,22 +118,27 @@ +QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) +QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) QMAKE_LIBS_NIS = -lnsl + QMAKE_LIBS_EGL = -lEGL QMAKE_LIBS_OPENGL = -lGLU -lGL - QMAKE_LIBS_OPENGL_QT = -lGL +@@ -35,10 +36,14 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 + QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -QMAKE_UIC = $$[QT_INSTALL_BINS]/uic +QMAKE_MOC = $(OE_QMAKE_MOC) +QMAKE_UIC = $(OE_QMAKE_UIC) ++QMAKE_UIC3 = $(OE_QMAKE_UIC3) +QMAKE_RCC = $(OE_QMAKE_RCC) ++QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) ++QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) -QMAKE_AR = ar cqs +QMAKE_AR = $(OE_QMAKE_AR) cqs QMAKE_OBJCOPY = objcopy QMAKE_RANLIB = -@@ -39,7 +40,7 @@ +@@ -51,7 +56,7 @@ QMAKE_COPY_DIR = $(COPY) -r QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir @@ -100,3 +147,6 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p +-- +1.6.6.1 + diff --git a/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2_2.10a.bb b/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2_2.10a.bb index 3602a7f..b75ce7e 100644 --- a/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2_2.10a.bb +++ b/meta-openembedded/meta-oe/recipes-qt/qt4/qmake2_2.10a.bb @@ -1,4 +1,4 @@ -QTVERSION="4.4.3" +QTVERSION="4.7.3" FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2" BBCLASSEXTEND = "native nativesdk" -- 2.7.4