summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 21:00:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:28 +0100
commitaea363afaa193feee774dad30d81c516ea4a98fc (patch)
tree00b6ca102fe4b7c09da87d482ec04a90d128e03c /meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
parent425df23c02b7dad3c843ec9959a51337ab450cd1 (diff)
downloadpoky-aea363afaa193feee774dad30d81c516ea4a98fc.tar.gz
qt4: replace all local patches with git patches with headers
* in preparation for upgrade to 4.8.3 (From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9) 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.1/disable-fuse-gold-flag.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
deleted file mode 100644
index 6efbaf5d97..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
+++ /dev/null
@@ -1,30 +0,0 @@
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
4Upstream-Status: Pending
5
6Signed-off-by: Ken Werner <ken.werner@linaro.org>
7
8Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
9===================================================================
10--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/webkit/Source/common.pri
11+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
12@@ -3,12 +3,12 @@
13 contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
14 contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
15
16-linux-g++ {
17-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
18- message(Using gold linker)
19- QMAKE_LFLAGS+=-fuse-ld=gold
20-}
21-}
22+#linux-g++ {
23+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
24+# message(Using gold linker)
25+# QMAKE_LFLAGS+=-fuse-ld=gold
26+#}
27+#}
28
29 # We use this flag on production branches
30 # See https://bugs.webkit.org/show_bug.cgi?id=60824