summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/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.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch
new file mode 100644
index 0000000000..92eddebaec
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch
@@ -0,0 +1,41 @@
1From d90b496f9ffdc828928ef84afad43260ea67ec1f 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/21] 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.8.0
41