Use makepkg build flags

3 files changed, 15 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7b7b7aac5be..8a3e8ed73c7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,6 +20,7 @@ pkgbase = fsl
 	depends = glu
 	depends = boost-libs
 	depends = vtk6
+	depends = sqlite
 	optdepends = cuda
 	source = http://www.fmrib.ox.ac.uk/fsldownloads/fsl-5.0.10-sources.tar.gz
 	source = http://www.fmrib.ox.ac.uk/fsldownloads/fsl-5.0.10-feeds.tar.gz
@@ -28,7 +29,7 @@ pkgbase = fsl
 	source = fsl_exec.patch
 	sha1sums = 34a4a3a0c3bc9e6fbf9a9745636c7b3b4479ecdf
 	sha1sums = 35108d2da18a6dfe1f9f6f6ff81b1a0836235c3c
-	sha1sums = 8c4badea905d49b10a937f9fd64ba1e7df384f25
+	sha1sums = 679c65c90e79b7f748ad1c2d4b5abeebebf05dfd
 	sha1sums = f7841c51fb221a74017400e4daef7de640679887
 	sha1sums = 2df550b126a6ec6022a164a18dddffe4e59962f9
 
diff --git a/PKGBUILD b/PKGBUILD
index 7bb7f7ecddda..11c174a97102 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,12 +7,12 @@ pkgdesc="A comprehensive library of analysis tools for FMRI, MRI and DTI brain i
 arch=("i686" "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 vtk6)
+depends=(gd libxml2 libxml++2.6 gsl libpng nlopt newmat tcl tk zlib python glu boost-libs vtk6 sqlite)
 makedepends=()
 optdepends=(cuda)
 sha1sums=('34a4a3a0c3bc9e6fbf9a9745636c7b3b4479ecdf'
           '35108d2da18a6dfe1f9f6f6ff81b1a0836235c3c'
-          '8c4badea905d49b10a937f9fd64ba1e7df384f25'
+          '679c65c90e79b7f748ad1c2d4b5abeebebf05dfd'
           'f7841c51fb221a74017400e4daef7de640679887'
           '2df550b126a6ec6022a164a18dddffe4e59962f9')
 
@@ -37,6 +37,13 @@ prepare() {
 	    cp "${srcdir}/externallibs.mk" "${FSLDIR}/config/${FSLMACHTYPE}/"
 	fi
 
+	# Copy makepkg build flags into configuration
+	sed -i '0,/${AccumulatedIncFlags}/{s^${AccumulatedIncFlags}^& '"${CFLAGS}"'^}' "${srcdir}/fsl/config/common/vars.mk"
+	sed -i '0,/${AccumulatedIncFlags}/{s^${AccumulatedIncFlags}^& '"${CPPFLAGS}"'^}' "${srcdir}/fsl/config/common/vars.mk"
+	sed -i '1,/${AccumulatedIncFlags}/!{s^${AccumulatedIncFlags}^& '"${CXXFLAGS}"'^}' "${srcdir}/fsl/config/common/vars.mk"
+	sed -i '1,/${AccumulatedIncFlags}/!{s^${AccumulatedIncFlags}^& '"${CPPFLAGS}"'^}' "${srcdir}/fsl/config/common/vars.mk"
+	sed -i 's^LDFLAGS = .*$^& '"${LDFLAGS}"'^g' "${srcdir}/fsl/config/common/vars.mk"
+
 	# Fix 32-bit
 	if test "$CARCH" == i686; then
 	    sed -i "s^-m64^^g" "${FSLDIR}/config/${FSLMACHTYPE}/systemvars.mk"
@@ -63,6 +70,9 @@ prepare() {
 	sed -i 's/ fftw"/"/g' "${FSLDIR}/extras/build"
 	sed -i 's/"tcl tk"/""/g' "${FSLDIR}/extras/build"
 
+	# Link mist-clean against system sqlite
+	sed -i 's^${SQLITE_LIB}/libsqlite3.a^-lsqlite3^g' "${srcdir}/fsl/src/mist-clean/Makefile"
+
 	# Fix Melodic use of ifstream
 	sed -i 's^if(in>0)^if(!!in)^g' "${FSLDIR}/src/melodic/meldata.cc"
 
diff --git a/systemvars.mk b/systemvars.mk
index 76180e2f9f1d..41661c37da58 100755
--- a/systemvars.mk
+++ b/systemvars.mk
@@ -30,7 +30,7 @@ PARALLELFLAGS = -fopenmp
 
 DEPENDFLAGS = -MM
 
-OPTFLAGS = -g -O3 -fexpensive-optimizations ${ARCHFLAGS}
+OPTFLAGS = -march=native -O3 -fexpensive-optimizations ${ARCHFLAGS}
 MACHDBGFLAGS = -g
 GNU_ANSI_FLAGS = -Wall -ansi -pedantic -std=c++11 -Wno-long-long
 SGI_ANSI_FLAGS = -ansi -fullwarn