diff options
author | Ken Werner <ken.werner@linaro.org> | 2012-04-27 12:59:17 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-30 11:37:28 +0100 |
commit | 69dc3c384ff91d1a5983b39a33fde23a8e711c5a (patch) | |
tree | 668c16cf4d2064c066603f6a439be3b92012384b /meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch | |
parent | e3bafe8ae13e61817ef5f5f095c7a7b9ab920c11 (diff) | |
download | poky-69dc3c384ff91d1a5983b39a33fde23a8e711c5a.tar.gz |
Qt 4.8 GCC 4.7 fixes
This change introduces two new patches to Qt 4.8. One prevents the build
system from using the -fuse-ld=gold GCC flag as this isn't upstream and
therefore not supported by many toolchains out there. The second patch
fixes a compile time error when using toolchains based on GCC 4.7.
(From OE-Core rev: c98d60923b84bcd285644cecaed1fa0455747a2f)
Signed-off-by: Ken Werner <ken.werner@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch b/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch new file mode 100644 index 0000000000..d49d7bcff2 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Disable the -fuse-ld=gold flag. This option is a Debian/Ubuntu specific | ||
2 | extension to the g++ and causes upstream GCC to throw an error. | ||
3 | |||
4 | Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri | ||
5 | =================================================================== | ||
6 | --- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/webkit/Source/common.pri | ||
7 | +++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri | ||
8 | @@ -3,12 +3,12 @@ | ||
9 | contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 | ||
10 | contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 | ||
11 | |||
12 | -linux-g++ { | ||
13 | -isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { | ||
14 | - message(Using gold linker) | ||
15 | - QMAKE_LFLAGS+=-fuse-ld=gold | ||
16 | -} | ||
17 | -} | ||
18 | +#linux-g++ { | ||
19 | +#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { | ||
20 | +# message(Using gold linker) | ||
21 | +# QMAKE_LFLAGS+=-fuse-ld=gold | ||
22 | +#} | ||
23 | +#} | ||
24 | |||
25 | # We use this flag on production branches | ||
26 | # See https://bugs.webkit.org/show_bug.cgi?id=60824 | ||