[SCM] supercollider/master: fix build on non-x86/64: define BOOST_LOCKFREE_DCAS_ALIGNMENT (Update prefix.hpp to current boost SVN 2012-07-03)
danstowell-guest at users.alioth.debian.org
danstowell-guest at users.alioth.debian.org
Tue Jul 3 07:33:26 UTC 2012
The following commit has been merged in the master branch:
commit 5be27faf7feab11998d2e004fd897ac14c295ed0
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date: Tue Jul 3 08:29:17 2012 +0100
fix build on non-x86/64: define BOOST_LOCKFREE_DCAS_ALIGNMENT
(Update prefix.hpp to current boost SVN 2012-07-03)
diff --git a/debian/patches/series b/debian/patches/series
index 9e29c4f..c1d82b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
install_readme_extensions.patch
+update_boostlockfree_prefixhpp.patch
diff --git a/debian/patches/update_boostlockfree_prefixhpp.patch b/debian/patches/update_boostlockfree_prefixhpp.patch
new file mode 100644
index 0000000..fd3e873
--- /dev/null
+++ b/debian/patches/update_boostlockfree_prefixhpp.patch
@@ -0,0 +1,24 @@
+--- a/external_libraries/boost_lockfree/boost/lockfree/detail/prefix.hpp
++++ b/external_libraries/boost_lockfree/boost/lockfree/detail/prefix.hpp
+@@ -4,8 +4,6 @@
+ // accompanying file LICENSE_1_0.txt or copy at
+ // http://www.boost.org/LICENSE_1_0.txt)
+
+-// Disclaimer: Not a Boost library.
+-
+ #ifndef BOOST_LOCKFREE_PREFIX_HPP_INCLUDED
+ #define BOOST_LOCKFREE_PREFIX_HPP_INCLUDED
+
+@@ -47,4 +45,12 @@
+ #endif
+ #endif /* __GNUC__ */
+
++#ifndef BOOST_LOCKFREE_DCAS_ALIGNMENT
++#define BOOST_LOCKFREE_DCAS_ALIGNMENT /*BOOST_LOCKFREE_DCAS_ALIGNMENT*/
++#endif
++
++#ifndef BOOST_LOCKFREE_CACHELINE_ALIGNMENT
++#define BOOST_LOCKFREE_CACHELINE_ALIGNMENT /*BOOST_LOCKFREE_CACHELINE_ALIGNMENT*/
++#endif
++
+ #endif /* BOOST_LOCKFREE_PREFIX_HPP_INCLUDED */
--
supercollider packaging
More information about the pkg-multimedia-commits
mailing list