From 12de5cd2576da2f4c7b184dca43a354dc9e10188 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sat, 21 Sep 2019 17:57:41 +0200
Subject: [PATCH] use nproc cores for compilation, enable jack2 again

---
 distributions/raspijamulus.sh | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh
index 9cb268d4..3494b5aa 100755
--- a/distributions/raspijamulus.sh
+++ b/distributions/raspijamulus.sh
@@ -2,6 +2,7 @@
 
 # This script is intended to setup a clean Raspberry Pi system for running Jamulus
 OPUS="opus-1.1"
+NCORES=$(nproc)
 
 echo "TODO: sudo apt-get install [needed libraries for compilation and runtime]"
 
@@ -14,26 +15,26 @@ else
   rm ${OPUS}.tar.gz
   cd ${OPUS}
   ./configure --enable-custom-modes --enable-fixed-point
-  make
+  make -j${NCORES}
   cd ..
 fi
 
-## Jack audio without DBUS support
-#if [ -d "jack2" ]; then
-#  echo "The Jack2 directory is present, we assume it is compiled and ready to use. If not, delete the jack2 directory and call this script again."
-#else
-#  git clone https://github.com/jackaudio/jack2.git
-#  cd jack2
-#  git checkout v1.9.12
-#  ./waf configure --alsa --prefix=/usr/local --libdir=/usr/lib/x86_64-linux-gnu
-#  ./waf
-#  cd ..
-#fi
+# Jack audio without DBUS support
+if [ -d "jack2" ]; then
+  echo "The Jack2 directory is present, we assume it is compiled and ready to use. If not, delete the jack2 directory and call this script again."
+else
+  git clone https://github.com/jackaudio/jack2.git
+  cd jack2
+  git checkout v1.9.12
+  ./waf configure --alsa --prefix=/usr/local --libdir=/usr/lib/x86_64-linux-gnu
+  ./waf -j${NCORES}
+  cd ..
+fi
 
 # compile Jamulus with external Opus library
 cd ..
 qmake "CONFIG+=opus_shared_lib" Jamulus.pro
-make
+make -j${NCORES}
 cd distributions
 
 # get first USB audio sound card device