summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 21:18:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:28 +0100
commit42b3fc6dd3c8a1c608306aa85ca5e5a77d94ee1d (patch)
treed04aaf16c9e9492586937186d48eb9f0dfa2631e /meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch
parent89386fde895a585c6322fc94b594c35a355555e7 (diff)
downloadpoky-42b3fc6dd3c8a1c608306aa85ca5e5a77d94ee1d.tar.gz
qt4: add 4.8.3 version with negative D_P
* rebased patches, 3 patches are resolved upstream: 0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch resolved in upstream commit 7ac8d8597db1f58b11338f91fb27f6ad8696b34b 0022-webkit-fix-conflicting-types.patch resolved in upstream commit929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1 (From OE-Core rev: b9fc4928bb93ad720c47920db3869d860c531d0a) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch
new file mode 100644
index 0000000000..1e07a54290
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch
@@ -0,0 +1,41 @@
1From a10ba547001f4a4ba0ae313a4e9c2c0b5bb36a09 Mon Sep 17 00:00:00 2001
2From: Ken Werner <ken.werner@linaro.org>
3Date: Wed, 26 Sep 2012 20:55:21 +0200
4Subject: [PATCH 20/20] webkit: disable the -fuse-ld=gold flag
5
6This option is a Debian/Ubuntu specific extension to the g++ and causes upstream GCC to throw an error.
7
8Upstream-Status: Pending
9
10Signed-off-by: Ken Werner <ken.werner@linaro.org>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 src/3rdparty/webkit/Source/common.pri | 12 ++++++------
14 1 file changed, 6 insertions(+), 6 deletions(-)
15
16diff --git a/src/3rdparty/webkit/Source/common.pri b/src/3rdparty/webkit/Source/common.pri
17index 0f62e14..d81a1f0 100644
18--- a/src/3rdparty/webkit/Source/common.pri
19+++ b/src/3rdparty/webkit/Source/common.pri
20@@ -3,12 +3,12 @@
21 contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
22 contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
23
24-linux-g++ {
25-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
26- message(Using gold linker)
27- QMAKE_LFLAGS+=-fuse-ld=gold
28-}
29-}
30+#linux-g++ {
31+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
32+# message(Using gold linker)
33+# QMAKE_LFLAGS+=-fuse-ld=gold
34+#}
35+#}
36
37 # We use this flag on production branches
38 # See https://bugs.webkit.org/show_bug.cgi?id=60824
39--
401.7.12
41