[arch-commits] Commit in qt4/kde-unstable (PKGBUILD ld-gold.patch)

[Andrea Scarpino]

    Date: Monday, February 18, 2013 @ 21:49:29
  Author: andrea
Revision: 178238

Fix build on i686

Added:
  qt4/kde-unstable/ld-gold.patch
Modified:
  qt4/kde-unstable/PKGBUILD

---------------+
 PKGBUILD      |    9 +++++++--
 ld-gold.patch |   22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-18 19:28:58 UTC (rev 178237)
+++ PKGBUILD	2013-02-18 20:49:29 UTC (rev 178238)
@@ -28,10 +28,12 @@
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
         'qtconfig.desktop'
-        'improve-cups-support.patch')
+        'improve-cups-support.patch'
+        'ld-gold.patch')
 md5sums=('89c5ecba180cae74c66260ac732dc5cb'
          '20ca06ef59775d749b9451ce7437fa9a'
-         'c439c7731c25387352d8453ca7574971')
+         'c439c7731c25387352d8453ca7574971'
+         '864de59a34a2f72ab2668dd918634b64')
 
 build() {
   cd ${_pkgfqn}
@@ -39,6 +41,9 @@
   # (FS#28381) (KDEBUG#180051)
   patch -p1 -i "${srcdir}"/improve-cups-support.patch
 
+  # build on i686 fails
+  patch -p1 -i "${srcdir}"/ld-gold.patch
+
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 

Added: ld-gold.patch
===================================================================
--- ld-gold.patch	                        (rev 0)
+++ ld-gold.patch	2013-02-18 20:49:29 UTC (rev 178238)
@@ -0,0 +1,22 @@
+diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
+--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me	2012-01-24 13:05:50.460890750 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri	2012-01-24 13:19:08.836799974 +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