summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gold-flag.patch
diff options
context:
space:
mode:
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.patch26
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 @@
1Disable the -fuse-ld=gold flag. This option is a Debian/Ubuntu specific
2extension to the g++ and causes upstream GCC to throw an error.
3
4Index: 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