diff options
| -rw-r--r-- | audio/spiralsynthmodular/Makefile | 6 | ||||
| -rw-r--r-- | audio/spiralsynthmodular/files/patch-gcc46 | 32 |
2 files changed, 35 insertions, 3 deletions
diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile index 4a32bbc48004..3837d0a34e74 100644 --- a/audio/spiralsynthmodular/Makefile +++ b/audio/spiralsynthmodular/Makefile @@ -79,9 +79,9 @@ post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|-ldl||; \ s|-lrt||; \ - s|^CC[[:space:]]*=.+$$|CC=${CC}|; \ - s|^CXX[[:space:]]*=.+$$|CXX=${CXX}|; \ - s|g\+\+|${CXX}|; \ + s|g\+\+|$$(CXX)|; \ + /^CC[[:space:]]*=.+$$/d; \ + /^CXX[[:space:]]*=.+$$/d; \ s,@FLTK_(C|CXX)FLAGS@,-I${LOCALBASE}/include,; \ s|-lpthread|${PTHREAD_LIBS}|g' diff --git a/audio/spiralsynthmodular/files/patch-gcc46 b/audio/spiralsynthmodular/files/patch-gcc46 new file mode 100644 index 000000000000..75f9e77444f1 --- /dev/null +++ b/audio/spiralsynthmodular/files/patch-gcc46 @@ -0,0 +1,32 @@ +--- SpiralSound/ChannelHandler.C~ ++++ SpiralSound/ChannelHandler.C +@@ -19,6 +19,9 @@ + #include "ChannelHandler.h" + #include <unistd.h> + ++#include <cstdlib> ++#include <cstring> ++ + using namespace std; + + //#define CHANNEL_DEBUG +--- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C~ ++++ SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C +@@ -30,6 +30,7 @@ + #include <stdio.h> + + #include <cstdlib> ++#include <cstring> + #include <sys/types.h> + #include <sys/stat.h> + #include <dirent.h> +--- SpiralSound/Sample.h~ ++++ SpiralSound/Sample.h +@@ -23,6 +23,7 @@ + + #include <assert.h> + #include <limits.h> ++#include <cstring> + #include <iostream> + + //#define DEBUG |