summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-qt
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-06-19 20:40:34 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2011-06-19 20:41:25 +0200
commitbf206c9185c84b52af3f281588d850d555950473 (patch)
treeeaee6f1525902b6e0a2e6d4b6b9d4bfb14f7ad8b /meta-oe/recipes-qt
parent1583b2362494cc5b876700f1ddd5a4ab1a0f161e (diff)
downloadmeta-openembedded-bf206c9185c84b52af3f281588d850d555950473.tar.gz
qmake2: update qt from 4.4.3 to 4.7.3
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-qt')
-rw-r--r--meta-oe/recipes-qt/qt4/qmake2.inc14
-rw-r--r--meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch82
-rw-r--r--meta-oe/recipes-qt/qt4/qmake2_2.10a.bb2
3 files changed, 76 insertions, 22 deletions
diff --git a/meta-oe/recipes-qt/qt4/qmake2.inc b/meta-oe/recipes-qt/qt4/qmake2.inc
index f2631b5f7..d38e83ef2 100644
--- a/meta-oe/recipes-qt/qt4/qmake2.inc
+++ b/meta-oe/recipes-qt/qt4/qmake2.inc
@@ -2,15 +2,18 @@ DESCRIPTION = "TrollTech Makefile Generator"
2PRIORITY = "optional" 2PRIORITY = "optional"
3HOMEPAGE = "http://www.trolltech.com" 3HOMEPAGE = "http://www.trolltech.com"
4SECTION = "devel" 4SECTION = "devel"
5LICENSE = "GPL" 5LICENSE = "LGPLv2.1 | GPLv3"
6LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
7 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
8 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
6PR = "r12" 9PR = "r12"
7 10
8# We call 'moc' during the build 11# We call 'moc' during the build
9DEPENDS = "qt4-tools-native" 12DEPENDS = "qt4-tools-native"
10 13
11QTVER = "qt-embedded-linux-opensource-src-${QTVERSION}" 14QTVER = "qt-everywhere-opensource-src-${QTVERSION}"
12 15
13SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \ 16SRC_URI = "http://get.qt.nokia.com/qt/source/${QTVER}.tar.gz \
14 file://0001-fix-mkspecs.patch \ 17 file://0001-fix-mkspecs.patch \
15 file://qt-config.patch \ 18 file://qt-config.patch \
16 file://use-lflags-last.patch \ 19 file://use-lflags-last.patch \
@@ -34,9 +37,10 @@ do_configure() {
34 # Make sure we regenerate all Makefiles 37 # Make sure we regenerate all Makefiles
35 find ${S} -name "Makefile" | xargs rm 38 find ${S} -name "Makefile" | xargs rm
36 # Install the OE build templates 39 # Install the OE build templates
37 for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibceabi-oe-g++ 40 for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibceabi-oe-g++ default
38 do 41 do
39 install -d ${S}/mkspecs/$template 42 install -d ${S}/mkspecs/$template
43 rm -f ${S}/mkspecs/$template/qmake.conf
40 install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf 44 install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
41 ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h 45 ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
42 done 46 done
@@ -59,7 +63,7 @@ do_configure() {
59 export QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4" 63 export QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4"
60 export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" 64 export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
61 export OE_QMAKE_RPATH="-Wl,-rpath-link," 65 export OE_QMAKE_RPATH="-Wl,-rpath-link,"
62 echo yes | ./configure -prefix ${STAGING_DIR_NATIVE}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" 66 (echo o; echo yes) | ./configure -prefix ${STAGING_DIR_NATIVE}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
63} 67}
64 68
65do_compile() { 69do_compile() {
diff --git a/meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch b/meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch
index 0fccb57c0..e36c554f4 100644
--- a/meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch
+++ b/meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch
@@ -1,6 +1,19 @@
1--- /tmp/g++.conf 2008-07-08 10:32:18.000000000 +0200 1From 04f1a1d766de39797362cd748299bd29251f6cfc Mon Sep 17 00:00:00 2001
2+++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/g++.conf 2008-07-08 10:34:15.000000000 +0200 2From: Koen Kooi <koen@dominion.thruhere.net>
3@@ -2,12 +2,12 @@ 3Date: Sun, 19 Jun 2011 19:50:05 +0200
4Subject: [PATCH] fix mkspecs for OE usage
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 mkspecs/common/g++.conf | 32 +++++++++++++++++++-------------
9 mkspecs/common/linux.conf | 33 +++++++++++++++++++--------------
10 2 files changed, 38 insertions(+), 27 deletions(-)
11
12diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
13index 0d511fc..80f925c 100644
14--- a/mkspecs/common/g++.conf
15+++ b/mkspecs/common/g++.conf
16@@ -2,13 +2,13 @@
4 # qmake configuration for common gcc 17 # qmake configuration for common gcc
5 # 18 #
6 19
@@ -8,15 +21,17 @@
8-QMAKE_CFLAGS += -pipe 21-QMAKE_CFLAGS += -pipe
9+QMAKE_CC = $(OE_QMAKE_CC) 22+QMAKE_CC = $(OE_QMAKE_CC)
10+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) 23+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
24+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
11 QMAKE_CFLAGS_DEPS += -M 25 QMAKE_CFLAGS_DEPS += -M
12 QMAKE_CFLAGS_WARN_ON += -Wall -W 26 QMAKE_CFLAGS_WARN_ON += -Wall -W
13 QMAKE_CFLAGS_WARN_OFF += -w 27 QMAKE_CFLAGS_WARN_OFF += -w
14-QMAKE_CFLAGS_RELEASE += -O2 28-QMAKE_CFLAGS_RELEASE += -O2
15+QMAKE_CFLAGS_RELEASE += 29-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
30+QMAKE_CFLAGS_RELEASE +=
16 QMAKE_CFLAGS_DEBUG += -g 31 QMAKE_CFLAGS_DEBUG += -g
17 QMAKE_CFLAGS_SHLIB += -fPIC 32 QMAKE_CFLAGS_SHLIB += -fPIC
18 QMAKE_CFLAGS_STATIC_LIB += -fPIC 33 QMAKE_CFLAGS_STATIC_LIB += -fPIC
19@@ -16,8 +16,8 @@ 34@@ -17,8 +17,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
20 QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} 35 QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
21 QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} 36 QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
22 37
@@ -27,31 +42,48 @@
27 QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS 42 QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
28 QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON 43 QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
29 QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF 44 QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
30@@ -30,9 +30,9 @@ 45@@ -32,12 +32,12 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
31 QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} 46 QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
32 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE 47 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
33 48
34-QMAKE_LINK = g++ 49-QMAKE_LINK = g++
35-QMAKE_LINK_SHLIB = g++ 50-QMAKE_LINK_SHLIB = g++
51-QMAKE_LINK_C = gcc
52-QMAKE_LINK_C_SHLIB = gcc
36-QMAKE_LFLAGS += 53-QMAKE_LFLAGS +=
54-QMAKE_LFLAGS_RELEASE += -Wl,-O1
37+QMAKE_LINK = $(OE_QMAKE_LINK) 55+QMAKE_LINK = $(OE_QMAKE_LINK)
38+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) 56+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
57+QMAKE_LINK_C = $(OE_QMAKE_LINK)
58+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
39+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) 59+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
40 QMAKE_LFLAGS_RELEASE += 60+QMAKE_LFLAGS_RELEASE +=
41 QMAKE_LFLAGS_DEBUG += 61 QMAKE_LFLAGS_DEBUG +=
42 QMAKE_LFLAGS_APP += 62 QMAKE_LFLAGS_APP +=
43@@ -41,7 +41,7 @@ 63 QMAKE_LFLAGS_SHLIB += -shared
64@@ -45,10 +45,16 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
44 QMAKE_LFLAGS_SONAME += -Wl,-soname, 65 QMAKE_LFLAGS_SONAME += -Wl,-soname,
45 QMAKE_LFLAGS_THREAD += 66 QMAKE_LFLAGS_THREAD +=
46 QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined 67 QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
47-QMAKE_RPATH = -Wl,-rpath, 68-QMAKE_LFLAGS_RPATH = -Wl,-rpath,
48+QMAKE_RPATH = -Wl,-rpath-link, 69+QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
49 70
50 QMAKE_PCH_OUTPUT_EXT = .gch 71 QMAKE_PCH_OUTPUT_EXT = .gch
51 72
52--- /tmp/linux.conf 2008-07-08 10:32:18.000000000 +0200 73 # -Bsymbolic-functions (ld) support
53+++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/linux.conf 2008-07-08 10:38:37.000000000 +0200 74 QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
54@@ -7,26 +7,28 @@ 75 QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
76+
77+# some linking helper...
78+CONFIG += rpath_libdirs
79+
80+# for the SDK
81+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
82diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
83index 4fbe2dc..a541355 100644
84--- a/mkspecs/common/linux.conf
85+++ b/mkspecs/common/linux.conf
86@@ -7,25 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
55 87
56 QMAKE_INCDIR = 88 QMAKE_INCDIR =
57 QMAKE_LIBDIR = 89 QMAKE_LIBDIR =
@@ -67,8 +99,18 @@
67+QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) 99+QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
68+QMAKE_INCDIR_OPENGL = 100+QMAKE_INCDIR_OPENGL =
69+QMAKE_LIBDIR_OPENGL = 101+QMAKE_LIBDIR_OPENGL =
70+ 102 QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
103 QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
104 QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
105 QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
106-QMAKE_INCDIR_EGL =
107+QMAKE_INCDIR_EGL =
108 QMAKE_LIBDIR_EGL =
109-QMAKE_INCDIR_OPENVG =
110+QMAKE_INCDIR_OPENVG =
111 QMAKE_LIBDIR_OPENVG =
71 112
113+
72 QMAKE_LIBS = 114 QMAKE_LIBS =
73 QMAKE_LIBS_DYNLOAD = -ldl 115 QMAKE_LIBS_DYNLOAD = -ldl
74-QMAKE_LIBS_X11 = -lXext -lX11 -lm 116-QMAKE_LIBS_X11 = -lXext -lX11 -lm
@@ -76,22 +118,27 @@
76+QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) 118+QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
77+QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) 119+QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
78 QMAKE_LIBS_NIS = -lnsl 120 QMAKE_LIBS_NIS = -lnsl
121 QMAKE_LIBS_EGL = -lEGL
79 QMAKE_LIBS_OPENGL = -lGLU -lGL 122 QMAKE_LIBS_OPENGL = -lGLU -lGL
80 QMAKE_LIBS_OPENGL_QT = -lGL 123@@ -35,10 +36,14 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
124 QMAKE_LIBS_OPENVG = -lOpenVG
81 QMAKE_LIBS_THREAD = -lpthread 125 QMAKE_LIBS_THREAD = -lpthread
82 126
83-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc 127-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
84-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic 128-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
85+QMAKE_MOC = $(OE_QMAKE_MOC) 129+QMAKE_MOC = $(OE_QMAKE_MOC)
86+QMAKE_UIC = $(OE_QMAKE_UIC) 130+QMAKE_UIC = $(OE_QMAKE_UIC)
131+QMAKE_UIC3 = $(OE_QMAKE_UIC3)
87+QMAKE_RCC = $(OE_QMAKE_RCC) 132+QMAKE_RCC = $(OE_QMAKE_RCC)
133+QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
134+QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
88 135
89-QMAKE_AR = ar cqs 136-QMAKE_AR = ar cqs
90+QMAKE_AR = $(OE_QMAKE_AR) cqs 137+QMAKE_AR = $(OE_QMAKE_AR) cqs
91 QMAKE_OBJCOPY = objcopy 138 QMAKE_OBJCOPY = objcopy
92 QMAKE_RANLIB = 139 QMAKE_RANLIB =
93 140
94@@ -39,7 +40,7 @@ 141@@ -51,7 +56,7 @@ QMAKE_COPY_DIR = $(COPY) -r
95 QMAKE_MOVE = mv -f 142 QMAKE_MOVE = mv -f
96 QMAKE_DEL_FILE = rm -f 143 QMAKE_DEL_FILE = rm -f
97 QMAKE_DEL_DIR = rmdir 144 QMAKE_DEL_DIR = rmdir
@@ -100,3 +147,6 @@
100 QMAKE_STRIPFLAGS_LIB += --strip-unneeded 147 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
101 QMAKE_CHK_DIR_EXISTS = test -d 148 QMAKE_CHK_DIR_EXISTS = test -d
102 QMAKE_MKDIR = mkdir -p 149 QMAKE_MKDIR = mkdir -p
150--
1511.6.6.1
152
diff --git a/meta-oe/recipes-qt/qt4/qmake2_2.10a.bb b/meta-oe/recipes-qt/qt4/qmake2_2.10a.bb
index 3602a7f24..b75ce7ed8 100644
--- a/meta-oe/recipes-qt/qt4/qmake2_2.10a.bb
+++ b/meta-oe/recipes-qt/qt4/qmake2_2.10a.bb
@@ -1,4 +1,4 @@
1QTVERSION="4.4.3" 1QTVERSION="4.7.3"
2FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2" 2FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2"
3 3
4BBCLASSEXTEND = "native nativesdk" 4BBCLASSEXTEND = "native nativesdk"