[spring] 02/05: Add gold-linker.patch and fix FTBFS on i386.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository spring.

commit acf52f66f5ee1cddd7ec38917926f289ae40afe1
Author: Markus Koschany <apo at debian.org>
Date:   Sat Oct 14 18:25:57 2017 +0200

    Add gold-linker.patch and fix FTBFS on i386.
---
 debian/patches/gold-linker.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 41 insertions(+)

diff --git a/debian/patches/gold-linker.patch b/debian/patches/gold-linker.patch
new file mode 100644
index 0000000..35f39b3
--- /dev/null
+++ b/debian/patches/gold-linker.patch
@@ -0,0 +1,40 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 14 Oct 2017 18:25:37 +0200
+Subject: gold linker
+
+Apparently there is still a bug with Debian's gold linker.
+
+Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=846921
+Forwarded: not-needed
+---
+ rts/build/cmake/TestCXXFlags.cmake | 14 +-------------
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/rts/build/cmake/TestCXXFlags.cmake b/rts/build/cmake/TestCXXFlags.cmake
+index 4f91ca5..1cf86a9 100644
+--- a/rts/build/cmake/TestCXXFlags.cmake
++++ b/rts/build/cmake/TestCXXFlags.cmake
+@@ -162,22 +162,10 @@ 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)
+-		# 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 ()
+-
+ 	if    (hasGold)
+ 		set(LDGOLD_FOUND TRUE)
+ 		set(LDGOLD_LINKER_FLAGS "")
diff --git a/debian/patches/series b/debian/patches/series
index a1b836b..8e10cc1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 glShaderSource.patch
 reproducible.patch
 sdl-debian.patch
+gold-linker.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/spring.git