[crux-commits] ports/contrib (3.5): suitesparse: 5.8.0 -> 5.8.1

crux at crux.nu crux at crux.nu
Wed Jul 15 08:19:03 UTC 2020


commit a79732b49bb97df5ac55dd8ec16a677327efdbc4
Author: Tim Biermann <tbier at posteo.de>
Date:   Wed Jul 15 08:12:15 2020 +0000

    suitesparse: 5.8.0 -> 5.8.1

diff --git a/suitesparse/.footprint b/suitesparse/.footprint
index bb1c69484..8678b36b7 100644
--- a/suitesparse/.footprint
+++ b/suitesparse/.footprint
@@ -1,6 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/RBio.h
+-rw-r--r--	root/root	usr/include/SLIP_LU.h
 -rw-r--r--	root/root	usr/include/SuiteSparseQR.hpp
 -rw-r--r--	root/root	usr/include/SuiteSparseQR_C.h
 -rw-r--r--	root/root	usr/include/SuiteSparseQR_definitions.h
@@ -95,12 +96,15 @@ lrwxrwxrwx	root/root	usr/lib/libldl.so.2 -> libldl.so.2.2.6
 lrwxrwxrwx	root/root	usr/lib/librbio.so -> librbio.so.2.2.6
 lrwxrwxrwx	root/root	usr/lib/librbio.so.2 -> librbio.so.2.2.6
 -rwxr-xr-x	root/root	usr/lib/librbio.so.2.2.6
+lrwxrwxrwx	root/root	usr/lib/libsliplu.so -> libsliplu.so.1.0.2
+lrwxrwxrwx	root/root	usr/lib/libsliplu.so.1 -> libsliplu.so.1.0.2
+-rwxr-xr-x	root/root	usr/lib/libsliplu.so.1.0.2
 lrwxrwxrwx	root/root	usr/lib/libspqr.so -> libspqr.so.2.0.9
 lrwxrwxrwx	root/root	usr/lib/libspqr.so.2 -> libspqr.so.2.0.9
 -rwxr-xr-x	root/root	usr/lib/libspqr.so.2.0.9
-lrwxrwxrwx	root/root	usr/lib/libsuitesparseconfig.so -> libsuitesparseconfig.so.5.8.0
-lrwxrwxrwx	root/root	usr/lib/libsuitesparseconfig.so.5 -> libsuitesparseconfig.so.5.8.0
--rwxr-xr-x	root/root	usr/lib/libsuitesparseconfig.so.5.8.0
+lrwxrwxrwx	root/root	usr/lib/libsuitesparseconfig.so -> libsuitesparseconfig.so.5.8.1
+lrwxrwxrwx	root/root	usr/lib/libsuitesparseconfig.so.5 -> libsuitesparseconfig.so.5.8.1
+-rwxr-xr-x	root/root	usr/lib/libsuitesparseconfig.so.5.8.1
 lrwxrwxrwx	root/root	usr/lib/libumfpack.so -> libumfpack.so.5.7.9
 lrwxrwxrwx	root/root	usr/lib/libumfpack.so.5 -> libumfpack.so.5.7.9
 -rwxr-xr-x	root/root	usr/lib/libumfpack.so.5.7.9
diff --git a/suitesparse/.signature b/suitesparse/.signature
index 115b7b167..fdd2aa517 100644
--- a/suitesparse/.signature
+++ b/suitesparse/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30ETSf4BqILf0mW7pc7ZukzWA+YnVsWG0CSseUwCWbnCk7lZMJ6eMVqV1bXhs/vtEn51HB3zDRqZlGVdMUfRXwc=
-SHA256 (Pkgfile) = be72df84a505f4decd9f2ec36ad94eddad845d2b69a7dd1a2f604af45974a16a
-SHA256 (.footprint) = afe9c77aca7ccad6855c88f2e125ca9cec4daaadec01933d4643133f73f2c2a5
-SHA256 (suitesparse-5.8.0.tar.gz) = 5ce343444c589d5c46d1ef2b4dde625fdb287e1838f24bc5a5f7054149145fc3
-SHA256 (suitesparse-no-demo.patch) = f80488bb076753d38ea21d207bd682bdc97e21220c733da025f518a5b7e8e030
+RWSagIOpLGJF31UTFlt4nIG+QlUBbNm4y0VMxrah+VV0aF0FNuINoEkU8PPxjHmFowJv6XkZQVF6XOaGHiFz9CaVnbEC+hUUJwI=
+SHA256 (Pkgfile) = 0607953452575594bb8a4f867608b57421405b2549497a69db315e52f8bdd098
+SHA256 (.footprint) = a60969b8be5fbf4caf2151de2a90a7607019c22f24809c2c52302e0ae4f0094d
+SHA256 (suitesparse-5.8.1.tar.gz) = 06726e471fbaa55f792578f9b4ab282ea9d008cf39ddcc3b42b73400acddef40
+SHA256 (suitesparse-no-demo.patch) = 7b822beb12dbb884788c966f1075810561e0dbcf4758ea49dd1abd190d6c7ce1
diff --git a/suitesparse/Pkgfile b/suitesparse/Pkgfile
index 97e92de71..00ff3d828 100644
--- a/suitesparse/Pkgfile
+++ b/suitesparse/Pkgfile
@@ -4,18 +4,28 @@
 # Depends on: chrpath intel-tbb lapack metis
 
 name=suitesparse
-version=5.8.0
+version=5.8.1
 release=1
-source=(https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$version/$name-$version.tar.gz suitesparse-no-demo.patch)
+source=(https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$version/$name-$version.tar.gz
+  suitesparse-no-demo.patch)
 
 build() {
   cd SuiteSparse-$version
-  patch -p1 -i ../suitesparse-no-demo.patch
-  BLAS=-lblas LAPACK=-llapack TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib/libmetis.so make
+  patch -p0 -i ../suitesparse-no-demo.patch
+  local PKGMK_SUITESPARSE+="
+  _BLAS=-lblas
+  LAPACK=-llapack
+  TBB=-ltbb
+  SPQR_CONFIG=-DHAVE_TBB
+  MY_METIS_LIB=/usr/lib/libmetis.so"
+
+  make $PKGMK_SUITESPARSE
+
   install -dm755 $PKG/usr/{include,lib}
 
-  BLAS=-lblas LAPACK=-llapack TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib/libmetis.so \
-  make INSTALL_LIB=$PKG/usr/lib INSTALL_INCLUDE=$PKG/usr/include install
+  INSTALL_LIB=$PKG/usr/lib \
+  INSTALL_INCLUDE=$PKG/usr/include \
+  make $PKGMK_SUITESPARSE install
 
   chrpath -d $PKG/usr/lib/*
 }
diff --git a/suitesparse/suitesparse-no-demo.patch b/suitesparse/suitesparse-no-demo.patch
index 936cdf97a..c3a292d9d 100644
--- a/suitesparse/suitesparse-no-demo.patch
+++ b/suitesparse/suitesparse-no-demo.patch
@@ -1,11 +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
+--- Makefile.orig	2020-07-15 07:58:07.491842393 +0000
++++ Makefile	2020-07-15 07:58:28.373318549 +0000
+@@ -16,7 +16,7 @@
+ # installs all libraries SuiteSparse/lib.
  go: metis
  	( cd SuiteSparse_config && $(MAKE) )
--	( cd Mongoose  && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
-+	( cd Mongoose  && $(MAKE) library 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) )


More information about the crux-commits mailing list