5.4.0

2 files changed, 30 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e6eca54a5b5..99611d082273 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-suitesparse
 	pkgdesc = A collection of sparse matrix libraries (mingw-w64)
-	pkgver = 4.4.3
+	pkgver = 5.4.0
 	pkgrel = 1
 	url = http://www.cise.ufl.edu/research/sparse/SuiteSparse/
 	arch = any
@@ -10,8 +10,8 @@ pkgbase = mingw-w64-suitesparse
 	options = !buildflags
 	options = !strip
 	options = staticlibs
-	source = http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.3.tar.gz
-	sha1sums = 3a583ca4c09c6e9d7c574d313ad93e514478bb29
+	source = http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-5.4.0.tar.gz
+	sha256sums = 374dd136696c653e34ef3212dc8ab5b61d9a67a6791d5ec4841efb838e94dbd1
 
 pkgname = mingw-w64-suitesparse
 
diff --git a/PKGBUILD b/PKGBUILD
index 56308432261c..e687e157f45e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 
 pkgname=mingw-w64-suitesparse
-pkgver=4.4.3
+pkgver=5.4.0
 pkgrel=1
 pkgdesc="A collection of sparse matrix libraries (mingw-w64)"
 url="http://www.cise.ufl.edu/research/sparse/SuiteSparse/"
@@ -9,19 +9,29 @@ depends=('mingw-w64-lapack')
 makedepends=('mingw-w64-gcc')
 license=('GPL')
 options=('!buildflags' '!strip' 'staticlibs')
-source=(http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${pkgver}.tar.gz)
-sha1sums=('3a583ca4c09c6e9d7c574d313ad93e514478bb29')
+source=("http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${pkgver}.tar.gz")
+sha256sums=('374dd136696c653e34ef3212dc8ab5b61d9a67a6791d5ec4841efb838e94dbd1')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
+prepare () {
+  cd "$srcdir"/SuiteSparse
+  sed -i "s|AR_TARGET = \$(LIBRARY).lib|AR_TARGET = \$(LIBRARY).a|g" SuiteSparse_config/SuiteSparse_config.mk
+  for _lib in AMD CAMD COLAMD BTF KLU LDL CCOLAMD CHOLMOD UMFPACK CXSparse RBio SPQR; do
+    sed -i "s| -lsuitesparseconfig| -lsuitesparseconfig -L../../lib|g" ${_lib}/Lib/Makefile
+  done
+  sed -i "s| -lsuitesparseconfig| -lsuitesparseconfig -fopenmp|g" CHOLMOD/Lib/Makefile
+}
+
 build() {
   cd "$srcdir"
   for _arch in ${_architectures}; do    
     cp -r SuiteSparse build-${_arch} && pushd build-${_arch}
-    for _lib in SuiteSparse_config AMD CAMD COLAMD BTF KLU LDL CCOLAMD UMFPACK CHOLMOD CXSparse RBio SPQR; do
-      make -C ${_lib} library CC=${_arch}-gcc CXX=${_arch}-g++ F77=${_arch}-gfortran \
-        AR=${_arch}-ar RANLIB=${_arch}-ranlib BLAS='-lblas -lgfortran -lgfortranbegin -lquadmath' CHOLMOD_CONFIG='-DNPARTITION' \
-        CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+    for _lib in SuiteSparse_config AMD CAMD COLAMD BTF KLU LDL CCOLAMD CHOLMOD UMFPACK CXSparse RBio SPQR; do
+      make -C ${_lib} library UNAME=Windows CC=${_arch}-gcc CXX=${_arch}-g++ F77=${_arch}-gfortran \
+        AR=${_arch}-ar RANLIB=${_arch}-ranlib BLAS='-lblas -lgfortran -lquadmath' CHOLMOD_CONFIG='-DNPARTITION' \
+        CFLAGS="-D_FORTIFY_SOURCE=2 -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4" \
+        SO_OPTS="-shared -Wl,--out-implib,\${SO_PLAIN}.a"
     done
     popd
   done
@@ -32,10 +42,16 @@ package() {
     install -dm755 "${pkgdir}"/usr/${_arch}/{lib,include/suitesparse}
     cd "${srcdir}"/build-${_arch} 
     for _lib in SuiteSparse_config AMD CAMD COLAMD BTF KLU LDL CCOLAMD UMFPACK CHOLMOD CXSparse RBio SPQR; do
-      make -C ${_lib} install INSTALL_LIB="${pkgdir}"/usr/${_arch}/lib INSTALL_INCLUDE="${pkgdir}"/usr/${_arch}/include/suitesparse
+      make -C ${_lib} install UNAME=Windows CC=${_arch}-gcc CXX=${_arch}-g++ F77=${_arch}-gfortran \
+        AR=${_arch}-ar RANLIB=${_arch}-ranlib BLAS='-lblas -lgfortran -lquadmath' CHOLMOD_CONFIG='-DNPARTITION' \
+        CFLAGS="-D_FORTIFY_SOURCE=2 -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4" \
+        SO_OPTS="-shared -Wl,--out-implib,\${SO_PLAIN}.a" INSTALL_LIB="${pkgdir}"/usr/${_arch}/lib INSTALL_INCLUDE="${pkgdir}"/usr/${_arch}/include/suitesparse
     done
-    make INSTALL_LIB="${pkgdir}"/usr/${_arch}/lib INSTALL_INCLUDE="${pkgdir}"/usr/${_arch}/include/suitesparse install
-    #${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
-    ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
+#     make UNAME=Windows CC=${_arch}-gcc CXX=${_arch}-g++ F77=${_arch}-gfortran \
+#         AR=${_arch}-ar RANLIB=${_arch}-ranlib BLAS='-lblas -lgfortran -lquadmath' CHOLMOD_CONFIG='-DNPARTITION' \
+#         CFLAGS="-D_FORTIFY_SOURCE=2 -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4" \
+#         SO_OPTS="-shared -Wl,--out-implib,\${SO_PLAIN}.a" INSTALL_LIB="${pkgdir}"/usr/${_arch}/lib INSTALL_INCLUDE="${pkgdir}"/usr/${_arch}/include/suitesparse install
+#     ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+#     ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
   done
 }