[spring] 08/29: Drop gold-linker.patch
Markus Koschany
apo at moszumanska.debian.org
Sat Oct 14 14:54:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository spring.
commit f7aca5200b6cf2bafd44743f2a17144cd72bc7c6
Author: Markus Koschany <apo at debian.org>
Date: Tue Oct 3 15:35:30 2017 +0200
Drop gold-linker.patch
---
debian/patches/gold-linker.patch | 51 ----------------------------------------
debian/patches/series | 1 -
2 files changed, 52 deletions(-)
diff --git a/debian/patches/gold-linker.patch b/debian/patches/gold-linker.patch
deleted file mode 100644
index ae4585b..0000000
--- a/debian/patches/gold-linker.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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)
diff --git a/debian/patches/series b/debian/patches/series
index 42a138d..49e1b77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
glShaderSource.patch
reproducible.patch
-gold-linker.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/spring.git
More information about the Pkg-games-commits
mailing list