[arch-commits] Commit in suitesparse/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Wed Oct 12 09:27:14 UTC 2016
Date: Wednesday, October 12, 2016 @ 09:27:13
Author: arojas
Revision: 278477
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
suitesparse/repos/extra-i686/PKGBUILD
(from rev 278476, suitesparse/trunk/PKGBUILD)
suitesparse/repos/extra-i686/suitesparse-link-tbb.patch
(from rev 278476, suitesparse/trunk/suitesparse-link-tbb.patch)
suitesparse/repos/extra-x86_64/PKGBUILD
(from rev 278476, suitesparse/trunk/PKGBUILD)
suitesparse/repos/extra-x86_64/suitesparse-link-tbb.patch
(from rev 278476, suitesparse/trunk/suitesparse-link-tbb.patch)
Deleted:
suitesparse/repos/extra-i686/PKGBUILD
suitesparse/repos/extra-i686/suitesparse-link-tbb.patch
suitesparse/repos/extra-x86_64/PKGBUILD
suitesparse/repos/extra-x86_64/suitesparse-link-tbb.patch
-----------------------------------------+
/PKGBUILD | 84 ++++++++++++++++++++++++++++++
/suitesparse-link-tbb.patch | 22 +++++++
extra-i686/PKGBUILD | 46 ----------------
extra-i686/suitesparse-link-tbb.patch | 11 ---
extra-x86_64/PKGBUILD | 46 ----------------
extra-x86_64/suitesparse-link-tbb.patch | 11 ---
6 files changed, 106 insertions(+), 114 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-10-12 09:26:20 UTC (rev 278476)
+++ extra-i686/PKGBUILD 2016-10-12 09:27:13 UTC (rev 278477)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=suitesparse
-pkgver=4.5.3
-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=('blas' '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=('2403007be38266e3607edfbf3833bee7f6bcb0f1'
- '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 make
-}
-
-
-package() {
- cd "${srcdir}"/SuiteSparse
- install -dm755 "${pkgdir}"/usr
-
- pushd metis-5.1.0
- make install DESTDIR="$pkgdir"
- mv "$pkgdir"/build/suitesparse/src/SuiteSparse/* "$pkgdir"/usr && rm -r "$pkgdir"/build
- popd
- BLAS=-lblas TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB make INSTALL_LIB="${pkgdir}"/usr/lib INSTALL_INCLUDE="${pkgdir}"/usr/include install
-
- # fix RPATH
- chrpath -d "$pkgdir"/usr/lib/*
-}
Copied: suitesparse/repos/extra-i686/PKGBUILD (from rev 278476, suitesparse/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-10-12 09:27:13 UTC (rev 278477)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=suitesparse
+pkgver=4.5.3
+pkgrel=2
+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=('2403007be38266e3607edfbf3833bee7f6bcb0f1'
+ '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 make INSTALL_LIB="${pkgdir}"/usr/lib INSTALL_INCLUDE="${pkgdir}"/usr/include install
+
+ # fix RPATH
+ chrpath -d "$pkgdir"/usr/lib/*
+}
Deleted: extra-i686/suitesparse-link-tbb.patch
===================================================================
--- extra-i686/suitesparse-link-tbb.patch 2016-10-12 09:26:20 UTC (rev 278476)
+++ extra-i686/suitesparse-link-tbb.patch 2016-10-12 09:27:13 UTC (rev 278477)
@@ -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-i686/suitesparse-link-tbb.patch (from rev 278476, suitesparse/trunk/suitesparse-link-tbb.patch)
===================================================================
--- extra-i686/suitesparse-link-tbb.patch (rev 0)
+++ extra-i686/suitesparse-link-tbb.patch 2016-10-12 09:27:13 UTC (rev 278477)
@@ -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:
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-10-12 09:26:20 UTC (rev 278476)
+++ extra-x86_64/PKGBUILD 2016-10-12 09:27:13 UTC (rev 278477)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=suitesparse
-pkgver=4.5.3
-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=('blas' '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=('2403007be38266e3607edfbf3833bee7f6bcb0f1'
- '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 make
-}
-
-
-package() {
- cd "${srcdir}"/SuiteSparse
- install -dm755 "${pkgdir}"/usr
-
- pushd metis-5.1.0
- make install DESTDIR="$pkgdir"
- mv "$pkgdir"/build/suitesparse/src/SuiteSparse/* "$pkgdir"/usr && rm -r "$pkgdir"/build
- popd
- BLAS=-lblas TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB 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 278476, suitesparse/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-10-12 09:27:13 UTC (rev 278477)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=suitesparse
+pkgver=4.5.3
+pkgrel=2
+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=('2403007be38266e3607edfbf3833bee7f6bcb0f1'
+ '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 make INSTALL_LIB="${pkgdir}"/usr/lib INSTALL_INCLUDE="${pkgdir}"/usr/include install
+
+ # fix RPATH
+ chrpath -d "$pkgdir"/usr/lib/*
+}
Deleted: extra-x86_64/suitesparse-link-tbb.patch
===================================================================
--- extra-x86_64/suitesparse-link-tbb.patch 2016-10-12 09:26:20 UTC (rev 278476)
+++ extra-x86_64/suitesparse-link-tbb.patch 2016-10-12 09:27:13 UTC (rev 278477)
@@ -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 278476, suitesparse/trunk/suitesparse-link-tbb.patch)
===================================================================
--- extra-x86_64/suitesparse-link-tbb.patch (rev 0)
+++ extra-x86_64/suitesparse-link-tbb.patch 2016-10-12 09:27:13 UTC (rev 278477)
@@ -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:
More information about the arch-commits
mailing list