summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
author David Spencer <baildon.research@googlemail.com>2015-08-21 14:17:30 +0100
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit02b1541b62f13c2333567b8fc090016a8cdc0b72 (patch)
tree61497f04bb4d3c3ddce6b371dd19437a61489f2f /audio
parent419ea9ca8d698c334e5bf484649fcd361286fd51 (diff)
downloadslackbuilds-02b1541b62f13c2333567b8fc090016a8cdc0b72.tar.gz
slackbuilds-02b1541b62f13c2333567b8fc090016a8cdc0b72.tar.xz
audio/SuperCollider: Patched SlackBuild.
Fixes build failure with gcc-4.9 on -current. Signed-off-by: David Spencer <baildon.research@googlemail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'audio')
-rw-r--r--audio/SuperCollider/SuperCollider.SlackBuild3
-rw-r--r--audio/SuperCollider/ftbfs-gcc-4.9.patch20
2 files changed, 23 insertions, 0 deletions
diff --git a/audio/SuperCollider/SuperCollider.SlackBuild b/audio/SuperCollider/SuperCollider.SlackBuild
index 26abf77a46..4deed9ce5a 100644
--- a/audio/SuperCollider/SuperCollider.SlackBuild
+++ b/audio/SuperCollider/SuperCollider.SlackBuild
@@ -61,6 +61,9 @@ if [ "$LIBDIRSUFFIX" = "64" ]; then
patch -p1 < $CWD/fixups_for_x86_64.diff
fi
+# Fix build failure with gcc-4.9 (thanks to Debian)
+patch -p1 < $CWD/ftbfs-gcc-4.9.patch
+
# Pass AVAHI=yes to the script to enable avahi support
if [ "${AVAHI:-no}" = "yes" ]; then avahi="OFF"; else avahi="ON"; fi
diff --git a/audio/SuperCollider/ftbfs-gcc-4.9.patch b/audio/SuperCollider/ftbfs-gcc-4.9.patch
new file mode 100644
index 0000000000..1b124f7277
--- /dev/null
+++ b/audio/SuperCollider/ftbfs-gcc-4.9.patch
@@ -0,0 +1,20 @@
+From: Felipe Sateler <fsateler@debian.org>
+Date: Fri, 6 Jun 2014 13:15:18 -0400
+Subject: Fix implementation of aligned_allocator::construct<U>.
+
+Fixes a build failure with gcc >= 4.9, because it defines __cplusplus >= 201103L.
+
+A typo, apparently. This patch can be dropped in the next upstream release.
+Index: supercollider/server/supernova/utilities/malloc_aligned.hpp
+===================================================================
+--- supercollider.orig/server/supernova/utilities/malloc_aligned.hpp 2014-09-11 09:15:20.399357542 +0100
++++ supercollider/server/supernova/utilities/malloc_aligned.hpp 2014-09-11 09:15:20.399357542 +0100
+@@ -243,7 +243,7 @@
+ template< class U, class... Args >
+ void construct(U * p, Args&& ... args)
+ {
+- ::new(p) T(std::forward<Args>(args)...);
++ ::new(p) U(std::forward<Args>(args)...);
+ }
+ #endif
+