[SCM] supercollider/master: Backport upstream patch for gcc5 atomic fix

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Sat Sep 26 20:52:53 UTC 2015


The following commit has been merged in the master branch:
commit 498249208ef7572d3f8f0b338cd04ef7b0cc4242
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sat Sep 26 17:43:06 2015 -0300

    Backport upstream patch for gcc5 atomic fix
    
    Closes: #795968

diff --git a/debian/patches/gcc5-compile-fix.patch b/debian/patches/gcc5-compile-fix.patch
new file mode 100644
index 0000000..568282b
--- /dev/null
+++ b/debian/patches/gcc5-compile-fix.patch
@@ -0,0 +1,22 @@
+From f08184651bfcdb4c3129d4ed006ebbe76ce0e2a5 Mon Sep 17 00:00:00 2001
+From: Tim Blechmann <tim at klingt.org>
+Date: Sun, 6 Sep 2015 10:12:46 +0200
+Subject: [PATCH] supernova: gcc-5 compile fix
+
+---
+ server/supernova/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/server/supernova/CMakeLists.txt
++++ b/server/supernova/CMakeLists.txt
+@@ -167,6 +167,10 @@ endif()
+ 
+ target_link_libraries(supernova libsupernova)
+ 
++if( ${_gcc_version} VERSION_GREATER 5 )
++  target_link_libraries( libsupernova atomic )
++endif()
++
+ if(WIN32)
+     target_link_libraries(libsupernova wsock32 ws2_32 winmm)
+ endif()
diff --git a/debian/patches/series b/debian/patches/series
index 8d1c14a..948967e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ perf-counter-include.patch
 supernova-i686-march-flag.patch
 system-lockfree.patch
 ftbfs-gcc-4.9.patch
+gcc5-compile-fix.patch

-- 
supercollider packaging



More information about the pkg-multimedia-commits mailing list