[SCM] supercollider/master: Patch to fix ftbfs when using system boost

danstowell-guest at users.alioth.debian.org danstowell-guest at users.alioth.debian.org
Tue Mar 15 23:01:12 UTC 2016


The following commit has been merged in the master branch:
commit b388f6c7e1537e06b8b43c92c70ffe1aafe7425e
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Mon Mar 14 02:55:57 2016 +0000

    Patch to fix ftbfs when using system boost

diff --git a/debian/copyright_hints b/debian/copyright_hints
index 51873ae..1610688 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1458,6 +1458,7 @@ Files: AUTHORS
  debian/control
  debian/gbp.conf
  debian/libscsynth1.install
+ debian/patches/cmake-fix-systemboost.patch
  debian/patches/gcc5-compile-fix.patch
  debian/patches/perf-counter-include.patch
  debian/patches/series
diff --git a/debian/patches/cmake-fix-systemboost.patch b/debian/patches/cmake-fix-systemboost.patch
new file mode 100644
index 0000000..bdb91c9
--- /dev/null
+++ b/debian/patches/cmake-fix-systemboost.patch
@@ -0,0 +1,23 @@
+Index: supercollider/external_libraries/CMakeLists.txt
+===================================================================
+--- supercollider.orig/external_libraries/CMakeLists.txt
++++ supercollider/external_libraries/CMakeLists.txt
+@@ -60,6 +60,9 @@ if(NOT Boost_FOUND) # we compile boost o
+ 		set_property(TARGET boost_thread
+ 			APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
+ 	endif()
++
++	set_property( TARGET boost_thread boost_program_options boost_system boost_filesystem PROPERTY FOLDER 3rdparty )
++
+ endif()
+ 
+ # tlsf
+@@ -98,7 +101,7 @@ if(NOT YAMLCPP_FOUND)
+ endif()
+ 
+ 
+-set_property( TARGET oscpack tlsf boost_thread boost_program_options boost_system boost_filesystem PROPERTY FOLDER 3rdparty )
++set_property( TARGET oscpack tlsf PROPERTY FOLDER 3rdparty )
+ 
+ 
+ ##### HID_API #######
diff --git a/debian/patches/series b/debian/patches/series
index c694501..0a323dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 perf-counter-include.patch
 supernova-i686-march-flag.patch
 gcc5-compile-fix.patch
+cmake-fix-systemboost.patch

-- 
supercollider packaging



More information about the pkg-multimedia-commits mailing list