diff --git a/suitesparse/.footprint b/suitesparse/.footprint index bc8a5cb85..914106a5b 100644 --- a/suitesparse/.footprint +++ b/suitesparse/.footprint @@ -98,9 +98,9 @@ lrwxrwxrwx root/root usr/lib/librbio.so.2 -> librbio.so.2.2.6 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.4.0 -lrwxrwxrwx root/root usr/lib/libsuitesparseconfig.so.5 -> libsuitesparseconfig.so.5.4.0 --rwxr-xr-x root/root usr/lib/libsuitesparseconfig.so.5.4.0 -lrwxrwxrwx root/root usr/lib/libumfpack.so -> libumfpack.so.5.7.8 -lrwxrwxrwx root/root usr/lib/libumfpack.so.5 -> libumfpack.so.5.7.8 --rwxr-xr-x root/root usr/lib/libumfpack.so.5.7.8 +lrwxrwxrwx root/root usr/lib/libsuitesparseconfig.so -> libsuitesparseconfig.so.5.5.0 +lrwxrwxrwx root/root usr/lib/libsuitesparseconfig.so.5 -> libsuitesparseconfig.so.5.5.0 +-rwxr-xr-x root/root usr/lib/libsuitesparseconfig.so.5.5.0 +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 bc2edc01d..6b0091052 100644 --- a/suitesparse/.signature +++ b/suitesparse/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35+AVeHXPwDTDOJpcHxiyaQ41YsPsQwfzuB40TXNl3jN1CkbYLWe3hGEafWKNl/1V27T00wMrcOcRBKKQfYRew0= -SHA256 (Pkgfile) = 2c8ac0845b7dd24fff1f2ceb54e2f923e0f980e9ba663efcd836611a948a9e9f -SHA256 (.footprint) = af0f77dc5550fb119d4a87b0a0769a45d2b1ab4f654892dbbc633fc42be41456 -SHA256 (SuiteSparse-5.4.0.tar.gz) = 374dd136696c653e34ef3212dc8ab5b61d9a67a6791d5ec4841efb838e94dbd1 -SHA256 (suitesparse-no-demo.patch) = bf74cc13040595ab8bd3a4a9cf09ca407237f42a5b2ff86bee6a84d2d850dcdd +RWSagIOpLGJF3/M03ozeI3aDuiPZYftIPZh6hyytCbHWRg5foPK4At9mMpAXt3Q6/wk3f9js8HQx76piYVJk4qt/PUbrNGCW4ws= +SHA256 (Pkgfile) = 78f0f19410680cf375c18a128166742fb6fc10eb2b20b4fdc566313a94b96b06 +SHA256 (.footprint) = 5319f54579251a3c16c10759f830c98c1d4bc9b2b3a52e05cc795b7e4fb75422 +SHA256 (suitesparse-5.6.0.tar.gz) = 76d34d9f6dafc592b69af14f58c1dc59e24853dcd7c2e8f4c98ffa223f6a1adb +SHA256 (suitesparse-no-demo.patch) = f80488bb076753d38ea21d207bd682bdc97e21220c733da025f518a5b7e8e030 diff --git a/suitesparse/Pkgfile b/suitesparse/Pkgfile index 2d46a78a2..35732b003 100644 --- a/suitesparse/Pkgfile +++ b/suitesparse/Pkgfile @@ -4,13 +4,13 @@ # Depends on: intel-tbb openblas metis chrpath name=suitesparse -version=5.4.0 +version=5.6.0 release=1 -source=(http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-$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() { - patch -p0 -i suitesparse-no-demo.patch - cd SuiteSparse + cd SuiteSparse-$version + patch -p1 -i ../suitesparse-no-demo.patch BLAS=-lblas TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib/libmetis.so make install -dm755 $PKG/usr/{include,lib} diff --git a/suitesparse/suitesparse-no-demo.patch b/suitesparse/suitesparse-no-demo.patch index 56c9696a5..936cdf97a 100644 --- a/suitesparse/suitesparse-no-demo.patch +++ b/suitesparse/suitesparse-no-demo.patch @@ -1,9 +1,9 @@ ---- 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 @@ +--- 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 GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) - ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) + ( cd Mongoose && $(MAKE) library CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) ( cd AMD && $(MAKE) )