libatomic.patch: Adding patch for fixing linking failures for libatomic with GCC > 5.1. PKGBUILD: Adding libatomic.patch. Updating to latest version. Minor typo fixes. Properly setting up tee to write to different files for cmake and make outputs. .SRCINFO: Updating to latest version.

1 files changed, 28 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9f8e27b21fc8..3025dfa1b8c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=supercollider-git
 _name="supercollider"
-pkgver=3.7.0.alpha1.r182.ge271d31
+pkgver=3.7.0.alpha1.r224.g4bdc1d7
 pkgrel=1
 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition."
 url="http://supercollider.sourceforge.net/"
@@ -18,8 +18,10 @@ optdepends=('emacs: emacs interface'
             'screen: vim interface')
 conflicts=('supercollider')
 provides=('supercollider')
-source=("${_name}::git+https://github.com/supercollider/supercollider")
-md5sums=('SKIP')
+source=("${_name}::git+https://github.com/supercollider/supercollider"
+        "libatomic.patch")
+md5sums=('SKIP'
+         '2956e6172cafcc9a38bdfdd2bc33e87b')
 install="$_name.install"
 
 pkgver() {
@@ -27,6 +29,13 @@ pkgver() {
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/Version.//g'
 }
 
+prepare() {
+  cd $srcdir/$_name
+  msg "Applying patch for fixing linking failure with GCC > 5.1"
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65913
+  patch -Np1 -i ../libatomic.patch
+}
+
 build() {
   cd $srcdir/$_name
   git submodule update --init --recursive .
@@ -54,35 +63,35 @@ build() {
         -DSC_IDE=OFF \
         -DSC_EL=ON \
         -DCMAKE_C_FLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
-        -DCMAKE_CXX_FLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
-      make -j4 | tee build-output.txt
+        -DCMAKE_CXX_FLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard" 2>&1 | tee cmake-output.txt
+      make -j4 2>&1 | tee make-output.txt
     ;;
     "armv7l")
       export CC="gcc"
       export CXX="g++"
       cmake .. -L \
-        -DCMAKE_INSTALL_PREFIX=/usr\
+        -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
-        -DBUILD_TESTING=OFF\
-        -DSSE=OFF\
-        -DSSE2=OFF\
+        -DBUILD_TESTING=OFF \
+        -DSSE=OFF \
+        -DSSE2=OFF \
         -DSUPERNOVA=OFF\
         -DNOVA_SIMD=ON \
-        -DNATIVE=OFF\
-        -DSC_QT=OFF\
-        -DSC_WII=OFF\
-        -DSC_ED=OFF\
-        -DSC_IDE=OFF\
+        -DNATIVE=OFF \
+        -DSC_QT=OFF \
+        -DSC_WII=OFF \
+        -DSC_ED=OFF \
+        -DSC_IDE=OFF \
         -DSC_EL=ON \
         -DCMAKE_C_FLAGS="-march=armv7-a -mtune=cortex-a8 -mfloat-abi=hard -mfpu=neon" \
-        -DCMAKE_CXX_FLAGS="-march=armv7-a -mtune=cortex-a8 -mfloat-abi=hard -mfpu=neon"
-      make -j4 | tee build-output.txt
+        -DCMAKE_CXX_FLAGS="-march=armv7-a -mtune=cortex-a8 -mfloat-abi=hard -mfpu=neon" 2>&1 | tee cmake-output.txt
+      make -j4 2>&1 | tee build-output.txt
     ;;
     *)
     cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-      -DSUPERNOVA=0 \
-      -DCMAKE_BUILD_TYPE=Release
-    make | tee build-output.txt
+      -DSUPERNOVA=1 \
+      -DCMAKE_BUILD_TYPE=Release 2>&1 | tee cmake-output.txt
+    make 2>&1 | tee make-output.txt
     ;;
   esac
 }