[spring] 01/05: Add gold-linker.patch
Markus Koschany
apo at moszumanska.debian.org
Fri Dec 9 00:08:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository spring.
commit c6c0da4e9494de5efc62916def35cba90b9f6733
Author: Markus Koschany <apo at debian.org>
Date: Tue Dec 6 18:04:25 2016 +0100
Add gold-linker.patch
---
debian/patches/gold-linker.patch | 45 ++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 46 insertions(+)
diff --git a/debian/patches/gold-linker.patch b/debian/patches/gold-linker.patch
new file mode 100644
index 0000000..aa6bdc9
--- /dev/null
+++ b/debian/patches/gold-linker.patch
@@ -0,0 +1,45 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 6 Dec 2016 18:04:02 +0100
+Subject: gold linker
+
+---
+ 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 819c0ae..bf6db38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
glShaderSource.patch
sdl-debian.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