Date: Tuesday, November 14, 2017 @ 08:23:37 Author: arojas Revision: 309908
archrelease: copy trunk to extra-x86_64 Added: suitesparse/repos/extra-x86_64/PKGBUILD (from rev 309907, suitesparse/trunk/PKGBUILD) suitesparse/repos/extra-x86_64/suitesparse-link-tbb.patch (from rev 309907, suitesparse/trunk/suitesparse-link-tbb.patch) Deleted: suitesparse/repos/extra-x86_64/PKGBUILD suitesparse/repos/extra-x86_64/suitesparse-link-tbb.patch ----------------------------+ PKGBUILD | 86 +++++++++++++++++++++---------------------- suitesparse-link-tbb.patch | 22 +++++------ 2 files changed, 54 insertions(+), 54 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-11-14 08:23:14 UTC (rev 309907) +++ PKGBUILD 2017-11-14 08:23:37 UTC (rev 309908) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> - -pkgname=suitesparse -pkgver=4.5.4 -pkgrel=1 -pkgdesc="A collection of sparse matrix libraries" -url="http://faculty.cse.tamu.edu/davis/suitesparse.html" -arch=('i686' 'x86_64') -conflicts=('umfpack') -provides=('umfpack') -replaces=('umfpack') -depends=('metis' 'lapack' 'intel-tbb') -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=('33fb47e3140f1dd8cae10847a9344439d4aa66b2' - '4f0b3836e8c3c1ec5be01f988f136cee4a2cb936') - -prepare() { -# Fix linking with intel-tbb - cd SuiteSparse - patch -p1 -i ../suitesparse-link-tbb.patch -} - -build() { - cd "$srcdir"/SuiteSparse - - BLAS=-lblas TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib/libmetis.so make -} - - -package() { - cd "${srcdir}"/SuiteSparse - 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 - - # fix RPATH - chrpath -d "$pkgdir"/usr/lib/* -} Copied: suitesparse/repos/extra-x86_64/PKGBUILD (from rev 309907, suitesparse/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-11-14 08:23:37 UTC (rev 309908) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> + +pkgname=suitesparse +pkgver=4.5.6 +pkgrel=1 +pkgdesc="A collection of sparse matrix libraries" +url="http://faculty.cse.tamu.edu/davis/suitesparse.html" +arch=('i686' 'x86_64') +conflicts=('umfpack') +provides=('umfpack') +replaces=('umfpack') +depends=('metis' 'lapack' 'intel-tbb') +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') + +prepare() { +# Fix linking with intel-tbb + cd SuiteSparse + patch -p1 -i ../suitesparse-link-tbb.patch +} + +build() { + cd "$srcdir"/SuiteSparse + + BLAS=-lblas TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib/libmetis.so make +} + + +package() { + cd "${srcdir}"/SuiteSparse + 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 + + # fix RPATH + chrpath -d "$pkgdir"/usr/lib/* +} Deleted: suitesparse-link-tbb.patch =================================================================== --- suitesparse-link-tbb.patch 2017-11-14 08:23:14 UTC (rev 309907) +++ suitesparse-link-tbb.patch 2017-11-14 08:23:37 UTC (rev 309908) @@ -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: Copied: suitesparse/repos/extra-x86_64/suitesparse-link-tbb.patch (from rev 309907, suitesparse/trunk/suitesparse-link-tbb.patch) =================================================================== --- suitesparse-link-tbb.patch (rev 0) +++ suitesparse-link-tbb.patch 2017-11-14 08:23:37 UTC (rev 309908) @@ -0,0 +1,11 @@ +--- 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: