[SCM] supercollider/master: Fix ia64 FTBFS: Avoid invoking perf_counter.hpp
danstowell-guest at users.alioth.debian.org
danstowell-guest at users.alioth.debian.org
Thu Jul 12 21:46:50 UTC 2012
The following commit has been merged in the master branch:
commit 91203bb75cb48073ae1e2858bd941beeeab7ea9f
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date: Wed Jul 11 08:16:56 2012 +0100
Fix ia64 FTBFS: Avoid invoking perf_counter.hpp
diff --git a/debian/changelog b/debian/changelog
index b242e3a..0b4dc0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ supercollider (1:3.5.3~repack-1) unstable; urgency=low
- Repack upstream source without boost sources
* Fix build on non-x86/64: define BOOST_LOCKFREE_DCAS_ALIGNMENT
(Update prefix.hpp to current boost SVN 2012-07-03)
+ * Fix build on ia64 - avoid invoking unneeded perf_counter.hpp
[ Jonas Smedegaard ]
* Unfuzz patch and refresh with shortening options.
diff --git a/debian/patches/deactivate_perf_counter.patch b/debian/patches/deactivate_perf_counter.patch
new file mode 100644
index 0000000..50e2761
--- /dev/null
+++ b/debian/patches/deactivate_perf_counter.patch
@@ -0,0 +1,13 @@
+Description: Avoid invoking perf_counter.hpp - doesn't build on ia64, and unneeded for building supercollider
+Author: Dan Stowell
+--- a/external_libraries/nova-simd/benchmarks/CMakeLists.txt
++++ b/external_libraries/nova-simd/benchmarks/CMakeLists.txt
+@@ -19,6 +19,8 @@
+ simd_unroll_benchmarks.cpp
+ )
+
++add_definitions(-DNO_PERFORMANCE_COUNTERS) # perf_counter.hpp functionality not needed unless profiling, and doesn't work for all platforms
++
+ # build benchmarks
+ foreach(benchmark ${benchmarks})
+ string(REPLACE .cpp "" benchmark_name ${benchmark} )
diff --git a/debian/patches/series b/debian/patches/series
index bc84489..0e7aa30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
update_boostlockfree_prefixhpp.patch
arm-qreal-is-float.patch
boost-big-endian-typo.patch
+deactivate_perf_counter.patch
--
supercollider packaging
More information about the pkg-multimedia-commits
mailing list