From: | "Davide Pesavento (pesa)" <pesa@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit/files: qt-webkit-4.8.1-no-use-ld-gold.patch |
Date: | Sat, 28 Apr 2012 10:52:47 |
Message-Id: | 20120428105237.8C5A62004B@flycatcher.gentoo.org |
1 | pesa 12/04/28 10:52:37 |
2 | |
3 | Added: qt-webkit-4.8.1-no-use-ld-gold.patch |
4 | Log: |
5 | Fix build with gcc-4.7 (bug 411849 by Andrew John Hughes and Nicolas Schlumberger). |
6 | |
7 | (Portage version: 2.2.0_alpha101/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 x11-libs/qt-webkit/files/qt-webkit-4.8.1-no-use-ld-gold.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/files/qt-webkit-4.8.1-no-use-ld-gold.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/files/qt-webkit-4.8.1-no-use-ld-gold.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: qt-webkit-4.8.1-no-use-ld-gold.patch |
16 | =================================================================== |
17 | diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri |
18 | --- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:39:16.884473572 +0200 |
19 | +++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:41:14.245006363 +0200 |
20 | @@ -3,13 +3,6 @@ |
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 | - |
31 | # We use this flag on production branches |
32 | # See https://bugs.webkit.org/show_bug.cgi?id=60824 |
33 | CONFIG += production |