[qtwebkit] gcc doesn't support flag -fuse-ld=gold yet
Than Ngo
than at fedoraproject.org
Tue Jan 24 13:58:07 UTC 2012
commit 23b0fc519fd59974e79c17a7bd66e5d09fb0800c
Author: Than Ngo <than at redhat.com>
Date: Tue Jan 24 14:58:00 2012 +0100
gcc doesn't support flag -fuse-ld=gold yet
qtwebkit.spec | 10 ++++++++--
webkit-qtwebkit-ld.gold.patch | 23 +++++++++++++++++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/qtwebkit.spec b/qtwebkit.spec
index 5a482b4..5e3173f 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -1,7 +1,7 @@
Name: qtwebkit
Version: 2.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Qt WebKit bindings
Group: System Environment/Libraries
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -29,6 +29,9 @@ Patch5: webkit-qtwebkit-2.2tp1-qt46.patch
# See https://bugs.webkit.org/show_bug.cgi?id=69840 for the gory details.
Patch6: qtwebkit-2.2.x-glib231-wk#69840.patch
+# gcc doesn't support flag -fuse-ld=gold
+Patch7: webkit-qtwebkit-ld.gold.patch
+
BuildRequires: bison
BuildRequires: chrpath
BuildRequires: flex
@@ -82,7 +85,7 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
%patch4 -p1 -b .no_Werror
%patch5 -p1 -b .qt46
%patch6 -p1 -b .glib231
-
+%patch7 -p1 -b .ld.gold
%build
@@ -135,6 +138,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Jan 24 2012 Than Ngo <than at redhat.com> - 2.2.1-4
+- gcc doesn't support flag -fuse-ld=gold yet
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/webkit-qtwebkit-ld.gold.patch b/webkit-qtwebkit-ld.gold.patch
new file mode 100644
index 0000000..cae7dbb
--- /dev/null
+++ b/webkit-qtwebkit-ld.gold.patch
@@ -0,0 +1,23 @@
+diff -up webkit-qtwebkit/Source/common.pri.me webkit-qtwebkit/Source/common.pri
+--- webkit-qtwebkit/Source/common.pri.me 2012-01-24 14:51:49.000000000 +0100
++++ webkit-qtwebkit/Source/common.pri 2012-01-24 14:52:01.000000000 +0100
+@@ -3,12 +3,12 @@
+ contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
+ contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
+
+-linux-g++ {
+-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
+- message(Using gold linker)
+- QMAKE_LFLAGS+=-fuse-ld=gold
+-}
+-}
++#linux-g++ {
++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
++# message(Using gold linker)
++# QMAKE_LFLAGS+=-fuse-ld=gold
++#}
++#}
+
+ # We use this flag on production branches
+ # See https://bugs.webkit.org/show_bug.cgi?id=60824
+diff -up webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h.me webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h
More information about the scm-commits
mailing list