[arch-commits] Commit in spring/trunk (PKGBUILD gold-linker.patch)

[Evangelos Foutras]

    Date: Thursday, August 3, 2017 @ 18:14:11
  Author: foutrelis
Revision: 247900

Use BFD linker to work around build failure on i686

Added:
  spring/trunk/gold-linker.patch
Modified:
  spring/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   10 +++++++---
 gold-linker.patch |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-03 18:09:47 UTC (rev 247899)
+++ PKGBUILD	2017-08-03 18:14:11 UTC (rev 247900)
@@ -16,16 +16,20 @@
 optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
 source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
+        gold-linker.patch
         0001-fix-build-with-curl-7.50.0.patch)
 md5sums=('e71a3dc16262b06b159157ecd52bbbe5'
+         '4837a3a273e346d159c3a9ad75ac1a1e'
          '8e4652c98c66016959fdd0dd1f6fc283')
 
 prepare() {
-  bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+  cd spring_$pkgver
 
-  cd spring_${pkgver}/tools/pr-downloader
+  # https://springrts.com/mantis/view.php?id=5413
+  patch -Np1 -i ../gold-linker.patch
 
-  patch -Np1 -i ${srcdir}/0001-fix-build-with-curl-7.50.0.patch 
+  patch -Np1 -d tools/pr-downloader <../0001-fix-build-with-curl-7.50.0.patch
+
 }
 
 build() {

Added: gold-linker.patch
===================================================================
--- gold-linker.patch	                        (rev 0)
+++ gold-linker.patch	2017-08-03 18:14:11 UTC (rev 247900)
@@ -0,0 +1,51 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 6 Dec 2016 18:04:02 +0100
+Subject: gold linker
+
+This is a bug in binutils which will probably not fixed in time for Stretch.
+Work around the build failure by switching to Debian's default linker instead
+of the gold linker. This patch can be reverted as soon as #847356 is fixed.
+
+Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=846921
+Forwarded: not-needed
+---
+ rts/build/cmake/TestCXXFlags.cmake | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/rts/build/cmake/TestCXXFlags.cmake b/rts/build/cmake/TestCXXFlags.cmake
+index 7b338d3..d566c55 100644
+--- a/rts/build/cmake/TestCXXFlags.cmake
++++ b/rts/build/cmake/TestCXXFlags.cmake
+@@ -162,21 +162,21 @@ if   (CMAKE_COMPILER_IS_GNUCXX)
+ 	)
+ 	set(hasGold FALSE)
+ 	if (${linkerVersion} MATCHES "gold")
+-		set(hasGold TRUE)
++        set(hasGold FALSE)
+ 	endif()
+ 
+ 
+-	if    (NOT hasGold AND NOT WIN32) #FIND_PROGRAM fails in crosscompile environments (it detects the native ld.gold)
++    #if    (NOT hasGold AND NOT WIN32) #FIND_PROGRAM fails in crosscompile environments (it detects the native ld.gold)
+ 		# since gcc 4.8 it is possible to switch the linker via that argument
+-		CHECK_CXX_ACCEPTS_FLAG("-fuse-ld=gold" HAS_USE_LD)
+-		IF    (HAS_USE_LD)
+-			FIND_PROGRAM(LD_GOLD ld.gold)
+-			if    (LD_GOLD)
+-				set(hasGold TRUE)
+-				set(LDGOLD_CXX_FLAGS "-fuse-ld=gold")
+-			endif ()
+-		EndIf ()
+-	endif ()
++        #CHECK_CXX_ACCEPTS_FLAG("-fuse-ld=gold" HAS_USE_LD)
++        #IF    (HAS_USE_LD)
++        #		FIND_PROGRAM(LD_GOLD ld.gold)
++        #	if    (LD_GOLD)
++        #		set(hasGold TRUE)
++        #		set(LDGOLD_CXX_FLAGS "-fuse-ld=gold")
++        #	endif ()
++        #	EndIf ()
++        #endif ()
+ 
+ 	if    (hasGold)
+ 		set(LDGOLD_FOUND TRUE)