CUDA support

3 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f420b1f5aaad..d591645711fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = fsl
 	pkgdesc = A comprehensive library of analysis tools for FMRI, MRI and DTI brain imaging data
 	pkgver = 6.0.5
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.fmrib.ox.ac.uk/fsl/
 	arch = x86_64
 	license = custom
 	makedepends = boost
 	makedepends = fftw
-	makedepends = gcc9
 	depends = gd
 	depends = libxml2
 	depends = libxml++2.6
@@ -23,7 +22,6 @@ pkgbase = fsl
 	depends = boost-libs
 	depends = vtk
 	depends = sqlite
-	depends = python3
 	depends = fslpy>=3.7.0
 	depends = bc
 	depends = openblas
@@ -37,7 +35,7 @@ pkgbase = fsl
 	source = 003-fix_missing_LIB_PROB.patch
 	sha256sums = df12b0b1161a26470ddf04e4c5d5d81580a04493890226207667ed8fd2b4b83f
 	sha256sums = e68e1efeb45750f876f350442f56c4830d211e9fb16daa5ad134bb8e1ef1ae18
-	sha256sums = 4b4620cd0018d78c961a2f64bd43a15405d799a57e4e026413793123a0cab6f4
+	sha256sums = 08eba697dfd9f9e9d102ab2a73b506f48a9c946a55a14393ed9743c3a0387bc5
 	sha256sums = 2516982d151ab9e450a9ac6d5a6fc87099a7acc067514d80422c69950e618170
 	sha256sums = 906ac7de8068e5a5487b083844b50b6afd7562866088a4175fd88030182affdd
 	sha256sums = 64b4ccefa63a3cf920b185dd52e94b918c24f2cedaebcec8efb767bd80a6418a
diff --git a/PKGBUILD b/PKGBUILD
index e7622908b9d6..f40f2d7d9544 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,20 @@
 
 # Set number of parallel compile jobs, default equals number of CPUs
 NJOBS=$(nproc)
-# Set to 1 to enable CUDA support ('cuda-9.1' from the AUR is needed)
-CUDA=0
+
+# Run makepkg or your usual AUR helper with CUDA=1 as an environment variable
+# or uncomment the following line ('cuda-9.1' from the AUR is needed)
+#CUDA=1
 
 pkgname=fsl
 pkgver=6.0.5
-pkgrel=4
+pkgrel=5
 pkgdesc="A comprehensive library of analysis tools for FMRI, MRI and DTI brain imaging data"
 arch=("x86_64")
 url="http://www.fmrib.ox.ac.uk/fsl/"
-license=(custom)
-depends=(gd libxml2 libxml++2.6 gsl libpng nlopt newmat tcl tk zlib python glu boost-libs vtk sqlite python3 'fslpy>=3.7.0' bc openblas)
-makedepends=(boost fftw gcc9)
+license=('custom')
+depends=('gd' 'libxml2' 'libxml++2.6' 'gsl' 'libpng' 'nlopt' 'newmat' 'tcl' 'tk' 'zlib' 'python' 'glu' 'boost-libs' 'vtk' 'sqlite' 'fslpy>=3.7.0' 'bc' 'openblas')
+makedepends=('boost' 'fftw')
 optdepends=('cuda-9.1')
 source=("https://www.fmrib.ox.ac.uk/fsldownloads/fsl-${pkgver}-sources.tar.gz"
         "https://www.fmrib.ox.ac.uk/fsldownloads/fsl-${pkgver}-feeds.tar.gz"
@@ -26,7 +28,7 @@ source=("https://www.fmrib.ox.ac.uk/fsldownloads/fsl-${pkgver}-sources.tar.gz"
 
 sha256sums=('df12b0b1161a26470ddf04e4c5d5d81580a04493890226207667ed8fd2b4b83f'
 	    'e68e1efeb45750f876f350442f56c4830d211e9fb16daa5ad134bb8e1ef1ae18'
-	    '4b4620cd0018d78c961a2f64bd43a15405d799a57e4e026413793123a0cab6f4'
+	    '08eba697dfd9f9e9d102ab2a73b506f48a9c946a55a14393ed9743c3a0387bc5'
 	    '2516982d151ab9e450a9ac6d5a6fc87099a7acc067514d80422c69950e618170'
 	    '906ac7de8068e5a5487b083844b50b6afd7562866088a4175fd88030182affdd'
 	    '64b4ccefa63a3cf920b185dd52e94b918c24f2cedaebcec8efb767bd80a6418a'
@@ -55,13 +57,13 @@ prepare() {
 	sed -i 's^LDFLAGS = .*$^& '"${LDFLAGS}"'^g' "${srcdir}/fsl/config/common/vars.mk"
         
         echo -e "\n"
-        if [ ${CUDA} -eq 1 ]; then
+        if [ -n "${CUDA}" ] && [ ${CUDA} -eq 1 ]; then
             sed -i 's/COMPILE_GPU\ \=\ 0/COMPILE_GPU\ \=\ 1/g' "${srcdir}"/buildSettings.mk
             # With CUDA enabled, ptx2 has to be compiled without --std=c++11
             sed -i '26 a GNU_ANSI_FLAGS = -Wall -ansi -pedantic -Wno-long-long' "${srcdir}"/fsl/src/ptx2/Makefile
             echo "CUDA support is enabled. You need to install 'cuda-9.1' from the AUR first."
         else
-            echo "CUDA support is disabled"
+            echo "CUDA support is disabled. To enable, set CUDA=1 in the PKGBUILD or as an environment variable."
         fi
         echo "Number of parallel compile jobs: ${NJOBS}"
         echo -e "\n"
diff --git a/buildSettings.mk b/buildSettings.mk
index 510fe7599842..4521b1063169 100644
--- a/buildSettings.mk
+++ b/buildSettings.mk
@@ -79,9 +79,9 @@ INC_NEWMAT = ${FSLEXTINC}/armawrap/armawrap -DARMA_USE_LAPACK -DARMA_USE_BLAS -D
 #####################################################################
 ifeq ($(SYSTYPE), Linux)
 ###############   System Vars   #####################################
-CC = gcc-9
-CXX = c++-9
-CXX11 = c++-9
+CC = gcc
+CXX = g++ 
+CXX11 = g++
 CSTATICFLAGS = -static
 CXXSTATICFLAGS = -static
 ARCHFLAGS = -m64