diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-01-03 13:41:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-04 12:08:31 +0000 |
commit | 670706d1d3e3b16636818584fec0441f70b793d9 (patch) | |
tree | c732b65f9e5049fb5694cdbe648f08f262f5e911 /meta/recipes-qt/qt4/qt-4.8.0 | |
parent | 99a6e1a3a453c17575439723599da6bef62175bb (diff) | |
download | poky-670706d1d3e3b16636818584fec0441f70b793d9.tar.gz |
qt4: add version 4.8.0
Version 4.8.0 makes a few minor changes in the internal build system -
the following issues had to be worked around:
* The -qt-gif configure option has been removed. This is actually the
default and has been for some time, so remove it from qt4.inc.
* The mkspecs have been refactored requiring us to copy our g++.conf
file over the top of g++-unix.conf instead. Some modifications to this
file were also necessary to remove some settings that are now in other
conf files (and we don't modify those values in any case).
* The LD environment variable needs to be unset during configure, or
else the configure script overrides our value of QMAKE_LINK which
selects ${CXX} as our linker.
* QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure
script does not expect and cannot expand and this results in webkit
being disabled, so add a workaround for this.
(From OE-Core rev: 6b2a5d15ad20573502142b635e6cab9bcfb3b40a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.8.0')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch | 47 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch | 32 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0/g++.conf | 56 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch | 31 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0/linux.conf | 66 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch | 20 |
6 files changed, 252 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch new file mode 100644 index 0000000000..f302c5bd61 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthias Günther <matgnt@gmail.com> | ||
3 | Date: Wed, 12 May 2010 16:52:45 +0200 | ||
4 | Subject: [PATCH 1/9] Added Openembedded "-crossarch" option | ||
5 | |||
6 | Original Author: Michael Lauer <mickey@vanille-media.de> | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | --- | ||
10 | configure | 7 ++++++- | ||
11 | 1 files changed, 6 insertions(+), 1 deletions(-) | ||
12 | |||
13 | diff --git a/configure b/configure | ||
14 | index facd192..9d15136 100755 | ||
15 | --- a/configure | ||
16 | +++ b/configure | ||
17 | @@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do | ||
18 | shift | ||
19 | VAL=$1 | ||
20 | ;; | ||
21 | - -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config) | ||
22 | + -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch) | ||
23 | VAR=`echo $1 | sed "s,^-\(.*\),\1,"` | ||
24 | shift | ||
25 | VAL="$1" | ||
26 | @@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do | ||
27 | xplatform) | ||
28 | XPLATFORM="$VAL" | ||
29 | ;; | ||
30 | + crossarch) | ||
31 | + CROSSARCH="$VAL" | ||
32 | + ;; | ||
33 | debug-and-release) | ||
34 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | ||
35 | CFG_DEBUG_RELEASE="$VAL" | ||
36 | @@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then | ||
37 | CFG_ARCH=$CFG_HOST_ARCH | ||
38 | fi | ||
39 | |||
40 | +CFG_ARCH="$CROSSARCH" | ||
41 | + | ||
42 | if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then | ||
43 | if [ "$OPT_VERBOSE" = "yes" ]; then | ||
44 | echo " '$CFG_ARCH' is supported" | ||
45 | -- | ||
46 | 1.7.0.4 | ||
47 | |||
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch new file mode 100644 index 0000000000..906d4e312f --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | fix phony translation linking error | ||
2 | |||
3 | | .../usr/lib/crt1.o: In function `_start': | ||
4 | | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main' | ||
5 | | collect2: ld returned 1 exit status | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
10 | |||
11 | diff --git a/translations/translations.pro b/translations/translations.pro | ||
12 | index cdaf04a..24fa668 100644 | ||
13 | --- a/translations/translations.pro | ||
14 | +++ b/translations/translations.pro | ||
15 | @@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} | ||
16 | updateqm.CONFIG += no_link | ||
17 | QMAKE_EXTRA_COMPILERS += updateqm | ||
18 | |||
19 | -isEmpty(vcproj) { | ||
20 | +!isEmpty(vcproj) { | ||
21 | QMAKE_LINK = @: IGNORE THIS LINE | ||
22 | OBJECTS_DIR = | ||
23 | win32:CONFIG -= embed_manifest_exe | ||
24 | @@ -30,7 +30,7 @@ isEmpty(vcproj) { | ||
25 | phony_src.input = PHONY_DEPS | ||
26 | phony_src.output = phony.c | ||
27 | phony_src.variable_out = GENERATED_SOURCES | ||
28 | - phony_src.commands = echo int main() { return 0; } > phony.c | ||
29 | + phony_src.commands = echo \"int main() { return 0; }\" > phony.c | ||
30 | phony_src.name = CREATE phony.c | ||
31 | phony_src.CONFIG += combine | ||
32 | QMAKE_EXTRA_COMPILERS += phony_src | ||
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/g++.conf b/meta/recipes-qt/qt4/qt-4.8.0/g++.conf new file mode 100644 index 0000000000..e58fb15718 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0/g++.conf | |||
@@ -0,0 +1,56 @@ | |||
1 | # | ||
2 | # qmake configuration for common gcc | ||
3 | # | ||
4 | |||
5 | QMAKE_CC = $(OE_QMAKE_CC) | ||
6 | QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) | ||
7 | QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) | ||
8 | QMAKE_CFLAGS_DEPS += -M | ||
9 | QMAKE_CFLAGS_WARN_ON += -Wall -W | ||
10 | QMAKE_CFLAGS_WARN_OFF += -w | ||
11 | QMAKE_CFLAGS_RELEASE += | ||
12 | QMAKE_CFLAGS_DEBUG += -g | ||
13 | QMAKE_CFLAGS_SHLIB += -fPIC | ||
14 | QMAKE_CFLAGS_STATIC_LIB += -fPIC | ||
15 | QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses | ||
16 | QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden | ||
17 | QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} | ||
18 | QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} | ||
19 | |||
20 | QMAKE_CXX = $(OE_QMAKE_CXX) | ||
21 | QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) | ||
22 | QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS | ||
23 | QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON | ||
24 | QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF | ||
25 | QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE | ||
26 | QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO | ||
27 | QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG | ||
28 | QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB | ||
29 | QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB | ||
30 | QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC | ||
31 | QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden | ||
32 | QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} | ||
33 | QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE | ||
34 | |||
35 | QMAKE_LINK = $(OE_QMAKE_LINK) | ||
36 | QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) | ||
37 | QMAKE_LINK_C = $(OE_QMAKE_LINK) | ||
38 | QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) | ||
39 | QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) | ||
40 | QMAKE_LFLAGS_RELEASE += | ||
41 | QMAKE_LFLAGS_DEBUG += | ||
42 | QMAKE_LFLAGS_APP += | ||
43 | QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined | ||
44 | QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, | ||
45 | |||
46 | QMAKE_PCH_OUTPUT_EXT = .gch | ||
47 | |||
48 | # -Bsymbolic-functions (ld) support | ||
49 | QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions | ||
50 | QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, | ||
51 | |||
52 | # some linking helper... | ||
53 | CONFIG += rpath_libdirs | ||
54 | |||
55 | # for the SDK | ||
56 | isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) | ||
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch new file mode 100644 index 0000000000..39c5f4a32c --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Hack to not use the pg_config of the host system which will add /usr/include | ||
2 | |||
3 | pg_config is a native binary so using that when cross compiling | ||
4 | will always fail. The commented out fix would do, but for OE | ||
5 | our -platform and -xplatform is the same so we are actually not | ||
6 | really cross compiling. Just comment out the test, we are passing | ||
7 | the location to the postgres headers and if they are okay we | ||
8 | will pad. | ||
9 | |||
10 | Original Author: Holger Hans Peter Freyther <zecke@selfish.org> | ||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | Index: qt-everywhere-opensource-src-4.7.0/configure | ||
14 | =================================================================== | ||
15 | --- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 | ||
16 | +++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400 | ||
17 | @@ -4921,10 +4921,10 @@ | ||
18 | psql) | ||
19 | if [ "$CFG_SQL_psql" != "no" ]; then | ||
20 | # Be careful not to use native pg_config when cross building. | ||
21 | - if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then | ||
22 | - QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` | ||
23 | - QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` | ||
24 | - fi | ||
25 | +# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then | ||
26 | +# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` | ||
27 | +# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` | ||
28 | +# fi | ||
29 | [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" | ||
30 | [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" | ||
31 | # But, respect PSQL_LIBS if set | ||
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/linux.conf b/meta/recipes-qt/qt4/qt-4.8.0/linux.conf new file mode 100644 index 0000000000..a54135513b --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0/linux.conf | |||
@@ -0,0 +1,66 @@ | |||
1 | # | ||
2 | # qmake configuration for common linux | ||
3 | # | ||
4 | |||
5 | QMAKE_CFLAGS_THREAD += -D_REENTRANT | ||
6 | QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD | ||
7 | |||
8 | QMAKE_INCDIR = | ||
9 | QMAKE_LIBDIR = | ||
10 | QMAKE_INCDIR_X11 = | ||
11 | QMAKE_LIBDIR_X11 = | ||
12 | QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) | ||
13 | QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) | ||
14 | QMAKE_INCDIR_OPENGL = | ||
15 | QMAKE_LIBDIR_OPENGL = | ||
16 | QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL | ||
17 | QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL | ||
18 | QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL | ||
19 | QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL | ||
20 | QMAKE_INCDIR_EGL = | ||
21 | QMAKE_LIBDIR_EGL = | ||
22 | QMAKE_INCDIR_OPENVG = | ||
23 | QMAKE_LIBDIR_OPENVG = | ||
24 | |||
25 | |||
26 | QMAKE_LIBS = | ||
27 | QMAKE_LIBS_DYNLOAD = -ldl | ||
28 | QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) | ||
29 | QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) | ||
30 | QMAKE_LIBS_NIS = -lnsl | ||
31 | QMAKE_LIBS_EGL = -lEGL | ||
32 | QMAKE_LIBS_OPENGL = -lGLU -lGL | ||
33 | QMAKE_LIBS_OPENGL_QT = -lGL | ||
34 | QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM | ||
35 | QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 | ||
36 | QMAKE_LIBS_OPENVG = -lOpenVG | ||
37 | QMAKE_LIBS_THREAD = -lpthread | ||
38 | |||
39 | QMAKE_MOC = $(OE_QMAKE_MOC) | ||
40 | QMAKE_UIC = $(OE_QMAKE_UIC) | ||
41 | QMAKE_UIC3 = $(OE_QMAKE_UIC3) | ||
42 | QMAKE_RCC = $(OE_QMAKE_RCC) | ||
43 | QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) | ||
44 | QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) | ||
45 | |||
46 | QMAKE_AR = $(OE_QMAKE_AR) cqs | ||
47 | QMAKE_OBJCOPY = objcopy | ||
48 | QMAKE_RANLIB = | ||
49 | |||
50 | QMAKE_TAR = tar -cf | ||
51 | QMAKE_GZIP = gzip -9f | ||
52 | |||
53 | QMAKE_COPY = cp -f | ||
54 | QMAKE_COPY_FILE = $(COPY) | ||
55 | QMAKE_COPY_DIR = $(COPY) -r | ||
56 | QMAKE_MOVE = mv -f | ||
57 | QMAKE_DEL_FILE = rm -f | ||
58 | QMAKE_DEL_DIR = rmdir | ||
59 | QMAKE_STRIP = $(OE_QMAKE_STRIP) | ||
60 | QMAKE_STRIPFLAGS_LIB += --strip-unneeded | ||
61 | QMAKE_CHK_DIR_EXISTS = test -d | ||
62 | QMAKE_MKDIR = mkdir -p | ||
63 | QMAKE_INSTALL_FILE = install -m 644 -p | ||
64 | QMAKE_INSTALL_PROGRAM = install -m 755 -p | ||
65 | |||
66 | include(unix.conf) | ||
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch new file mode 100644 index 0000000000..a82f0ff9d1 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Allow expansion of $(...) references in QMAKE_CXX (currently its value | ||
2 | is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed | ||
3 | which allows WebKit to be enabled. | ||
4 | |||
5 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
6 | |||
7 | Index: qt-everywhere-opensource-src-4.8.0/configure | ||
8 | =================================================================== | ||
9 | --- qt-everywhere-opensource-src-4.8.0.orig/configure | ||
10 | +++ qt-everywhere-opensource-src-4.8.0/configure | ||
11 | @@ -3322,7 +3322,8 @@ else | ||
12 | CFG_FRAMEWORK=no | ||
13 | fi | ||
14 | |||
15 | -QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1` | ||
16 | +QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg' | tail -1` | ||
17 | +QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"` | ||
18 | TEST_COMPILER="$CXX" | ||
19 | |||
20 | [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER | ||