[arch-commits] Commit in suitesparse/trunk (PKGBUILD suitesparse-link-tbb.patch)

[Antonio Rojas]

    Date: Wednesday, December 13, 2017 @ 21:24:05
  Author: arojas
Revision: 312364

Update to 5.1.0

Modified:
  suitesparse/trunk/PKGBUILD
Deleted:
  suitesparse/trunk/suitesparse-link-tbb.patch

----------------------------+
 PKGBUILD                   |   17 +++++------------
 suitesparse-link-tbb.patch |   11 -----------
 2 files changed, 5 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-13 20:01:18 UTC (rev 312363)
+++ PKGBUILD	2017-12-13 21:24:05 UTC (rev 312364)
@@ -2,7 +2,7 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=suitesparse
-pkgver=4.5.6
+pkgver=5.1.0
 pkgrel=1
 pkgdesc="A collection of sparse matrix libraries"
 url="http://faculty.cse.tamu.edu/davis/suitesparse.html"
@@ -14,18 +14,11 @@
 makedepends=('gcc-fortran' 'cmake' 'chrpath')
 license=('GPL')
 options=('staticlibs')
-source=("http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-$pkgver.tar.gz" suitesparse-link-tbb.patch)
-sha1sums=('06ed5f6f61bfe09f08ce03971a24381a627446b1'
-          '4f0b3836e8c3c1ec5be01f988f136cee4a2cb936')
+source=("http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-$pkgver.tar.gz")
+sha1sums=('bedf8aa7fdff4247cf1b9029a86cbb76c11627db')
 
-prepare() {
-# Fix linking with intel-tbb
-  cd SuiteSparse
-  patch -p1 -i ../suitesparse-link-tbb.patch
-}
-
 build() {
-   cd "$srcdir"/SuiteSparse
+   cd SuiteSparse
 
    BLAS=-lblas TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib/libmetis.so make
 }
@@ -32,7 +25,7 @@
 
 
 package() {
-   cd "${srcdir}"/SuiteSparse
+   cd SuiteSparse
    install -dm755 "${pkgdir}"/usr/{include,lib}
 
    BLAS=-lblas TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib/libmetis.so \

Deleted: suitesparse-link-tbb.patch
===================================================================
--- suitesparse-link-tbb.patch	2017-12-13 20:01:18 UTC (rev 312363)
+++ suitesparse-link-tbb.patch	2017-12-13 21:24:05 UTC (rev 312364)
@@ -1,11 +0,0 @@
---- SuiteSparse/SPQR/Lib/Makefile.orig	2016-09-24 09:36:59.588640845 +0000
-+++ SuiteSparse/SPQR/Lib/Makefile	2016-09-24 09:37:14.248588339 +0000
-@@ -13,7 +13,7 @@
- include ../../SuiteSparse_config/SuiteSparse_config.mk
- 
- # SPQR depends on CHOLMOD, AMD, COLAMD, LAPACK, the BLAS and SuiteSparse_config
--LDLIBS += -lamd -lcolamd -lcholmod -lsuitesparseconfig $(LAPACK) $(BLAS)
-+LDLIBS += -lamd -lcolamd -lcholmod -lsuitesparseconfig $(LAPACK) $(BLAS) $(TBB)
- 
- # compile and install in SuiteSparse/lib
- library: