[SCM] blender/master: debian/patches/: patchset updated

mfv at users.alioth.debian.org mfv at users.alioth.debian.org
Wed Sep 28 07:18:57 UTC 2016


The following commit has been merged in the master branch:
commit 888f5d4b83cb452ccea0d0c4e277c1c0e4671502
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Tue Sep 27 22:14:56 2016 +0200

    debian/patches/: patchset updated
    
    - 0011-fix_ld-gold_issue.patch added
    
    Closes: #838373

diff --git a/debian/patches/0011-fix_ld-gold_issue.patch b/debian/patches/0011-fix_ld-gold_issue.patch
new file mode 100644
index 0000000..8e61f24
--- /dev/null
+++ b/debian/patches/0011-fix_ld-gold_issue.patch
@@ -0,0 +1,31 @@
+From: "Matteo F. Vescovi" <mfv at debian.org>
+Date: Tue, 27 Sep 2016 22:08:42 +0200
+Subject: fix_ld-gold_issue
+
+---
+ CMakeLists.txt | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d285df9..fd9f657 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1192,18 +1192,6 @@ if(UNIX AND NOT APPLE)
+ 	if(CMAKE_COMPILER_IS_GNUCC)
+ 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+ 
+-		# use ld.gold linker if available, could make optional
+-		execute_process(
+-		        COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
+-		        ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+-		if("${LD_VERSION}" MATCHES "GNU gold")
+-			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
+-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
+-		else()
+-			message(STATUS "GNU gold linker isn't available, using the default system linker.")
+-		endif()
+-		unset(LD_VERSION)
+-
+ 	# CLang is the same as GCC for now.
+ 	elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
+ 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
diff --git a/debian/patches/series b/debian/patches/series
index 386f918..e3ead8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-make_blender_reproducible.patch
 0009-fix_OpenJPEG2_build.patch
 0010-fix_manpage_creation.patch
+0011-fix_ld-gold_issue.patch

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list