[arch-commits] Commit in suitesparse/trunk (3 files)

[Antonio Rojas]

    Date: Tuesday, November 5, 2019 @ 22:44:29
  Author: arojas
Revision: 366820

Update to 5.6.0

Added:
  suitesparse/trunk/suitesparse-no-demo.patch
Modified:
  suitesparse/trunk/PKGBUILD
Deleted:
  suitesparse/trunk/suitesparse-no-demo.patch

---------------------------+
 PKGBUILD                  |   28 +++++++++++++++-------------
 suitesparse-no-demo.patch |   22 +++++++++++-----------
 2 files changed, 26 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-05 21:16:35 UTC (rev 366819)
+++ PKGBUILD	2019-11-05 22:44:29 UTC (rev 366820)
@@ -1,7 +1,7 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=suitesparse
-pkgver=5.4.0
+pkgver=5.6.0
 pkgrel=1
 pkgdesc="A collection of sparse matrix libraries"
 url="http://faculty.cse.tamu.edu/davis/suitesparse.html"
@@ -13,29 +13,31 @@
 makedepends=('gcc-fortran' 'cmake' 'chrpath')
 license=('GPL')
 options=('staticlibs')
-source=("http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-$pkgver.tar.gz"
+source=($pkgname-$pkgver.tar.gz::"https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$pkgver.tar.gz"
         suitesparse-no-demo.patch)
-sha1sums=('23bb875f50c2b1ea7d9e7885e1956fa02e210824'
-          '2737ae324e50d3f3941619fbc64ba6e0a8d6993e')
+sha1sums=('3de08b5ab02610ed0446225aad2445696616fae5'
+          'ccc5089c3e13173b8f03af515dbcc7041b4005de')
 
 prepare() {
-  patch -p0 -i suitesparse-no-demo.patch # Don't run test application at build time
+  cd SuiteSparse-$pkgver
+  patch -p1 -i ../suitesparse-no-demo.patch
 }
 
 build() {
-   cd SuiteSparse
+  cd SuiteSparse-$pkgver
 
-   BLAS=-lblas TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib/libmetis.so make
+  BLAS=-lblas TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib/libmetis.so make
 }
 
 
 package() {
-   cd SuiteSparse
-   install -dm755 "${pkgdir}"/usr/{include,lib}
+  cd SuiteSparse-$pkgver
+  install -dm755 "${pkgdir}"/usr/{include,lib}
 
-   BLAS=-lblas TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib/libmetis.so \
-     make INSTALL_LIB="${pkgdir}"/usr/lib INSTALL_INCLUDE="${pkgdir}"/usr/include install
+  BLAS=-lblas TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib/libmetis.so \
+  make INSTALL_LIB="${pkgdir}"/usr/lib INSTALL_INCLUDE="${pkgdir}"/usr/include install
 
-   # fix RPATH
-   chrpath -d "$pkgdir"/usr/lib/*
+  # fix RPATH
+  chrpath -d "$pkgdir"/usr/lib/*
 }
+

Deleted: suitesparse-no-demo.patch
===================================================================
--- suitesparse-no-demo.patch	2019-11-05 21:16:35 UTC (rev 366819)
+++ suitesparse-no-demo.patch	2019-11-05 22:44:29 UTC (rev 366820)
@@ -1,11 +0,0 @@
---- SuiteSparse/Makefile.orig	2018-07-09 06:14:46.321600511 +0000
-+++ SuiteSparse/Makefile	2018-07-09 06:14:56.631628163 +0000
-@@ -13,7 +13,7 @@
- go: metis
- 	( cd SuiteSparse_config && $(MAKE) )
- 	( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
--	( cd Mongoose  && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
-+	( cd Mongoose  && $(MAKE) library CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
- 	( cd AMD && $(MAKE) )
- 	( cd BTF && $(MAKE) )
- 	( cd CAMD && $(MAKE) )

Added: suitesparse-no-demo.patch
===================================================================
--- suitesparse-no-demo.patch	                        (rev 0)
+++ suitesparse-no-demo.patch	2019-11-05 22:44:29 UTC (rev 366820)
@@ -0,0 +1,11 @@
+--- SuiteSparse-5.6.0/Makefile.orig	2019-11-05 22:37:26.086135974 +0000
++++ SuiteSparse-5.6.0/Makefile	2019-11-05 22:37:37.549632429 +0000
+@@ -12,7 +12,7 @@
+ # Compile the default rules for each package
+ go: metis
+ 	( cd SuiteSparse_config && $(MAKE) )
+-	( cd Mongoose  && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
++	( cd Mongoose  && $(MAKE) library CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
+ 	( cd AMD && $(MAKE) )
+ 	( cd BTF && $(MAKE) )
+ 	( cd CAMD && $(MAKE) )