suitesparse: update to 7.7.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: suitesparse: update to 7.7.0
From: Kevin Bloom <kevin.bloom%posteo.net@localhost>
Date: Mon, 20 May 2024 22:32:07 +0000
Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Mon May 20 18:31:51 2024 -0400
Changeset:	2f270be53fdac189309cc47c3afdd56becf0cbae

Modified Files:
	suitesparse/Makefile
	suitesparse/PLIST
	suitesparse/distinfo
	suitesparse/patches/patch-SPQR_Source_spqr__factorize.cpp
Added Files:
	suitesparse/patches/patch-GraphBLAS_CMakeLists.txt

Log Message:
suitesparse: update to 7.7.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2f270be53fdac189309cc47c3afdd56becf0cbae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 suitesparse/Makefile                               | 17 ++++---
 suitesparse/PLIST                                  | 59 +++++-----------------
 suitesparse/distinfo                               | 11 ++--
 suitesparse/patches/patch-GraphBLAS_CMakeLists.txt | 22 ++++++++
 .../patches/patch-SPQR_Source_spqr__factorize.cpp  |  5 +-
 5 files changed, 54 insertions(+), 60 deletions(-)

diffs:
diff --git a/suitesparse/Makefile b/suitesparse/Makefile
index 07ea36cf5f..1bc57e1622 100644
--- a/suitesparse/Makefile
+++ b/suitesparse/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.12 2012/11/28 21:43:05 outpaddling Exp $
 
-DISTNAME=	SuiteSparse-4.0.2
-PKGNAME=	suitesparse-4.0.2
-PKGREVISION=	2
+DISTNAME=	SuiteSparse-7.7.0
+PKGNAME=	suitesparse-7.7.0
 CATEGORIES=	math
-MASTER_SITES=	http://faculty.cse.tamu.edu/davis/SuiteSparse/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=DrTimothyAldenDavis/}
+GITHUB_TAG=	refs/tags/v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.cise.ufl.edu/research/sparse/SuiteSparse/
@@ -32,7 +32,7 @@ USE_TOOLS+=	gmake gsed
 
 USE_LANGUAGES=	c c++ fortran77
 
-WRKSRC=		${WRKDIR}/SuiteSparse
+WRKSRC=		${WRKDIR}/${DISTNAME}
 # Creating shared libs for all platforms is complicated.  Putting this off
 # for now.
 # WRKSRC_SHARED=${WRKSRC}_shared
@@ -50,7 +50,7 @@ AUTO_MKDIRS=		yes
 INSTALLATION_DIRS=	include/suitesparse lib
 
 # Non-standard variables used by SuiteSparse Makefiles
-MAKE_FLAGS+=	BLAS="${LDFLAGS} ${BLAS_LIBS}" \
+MAKE_FLAGS+=	BLAS_LIBRARIES="${LDFLAGS} ${BLAS_LIBS}" \
 		CHOLMOD_CONFIG="${CHOLMOD_CONFIG}" \
 		CPLUSPLUS="${CXX}" \
 		CF="${CFLAGS} ${CXXFLAGS}" \
@@ -59,7 +59,8 @@ MAKE_FLAGS+=	BLAS="${LDFLAGS} ${BLAS_LIBS}" \
 		METIS="${METIS}" \
 		METIS_PATH="${METIS_PATH}" \
 		SPQR_CONFIG="${CHOLMOD_CONFIG}" \
-		LIB="${LIB}"
+		LIB="${LIB}" \
+		CMAKE_C_FLAGS_RELEASE="-DGBNCPUFEAT"
 
 post-patch:
 	${CP} ${FILESDIR}/SuiteSparse_config.mk ${WRKSRC}/SuiteSparse_config
@@ -117,4 +118,6 @@ do-install:
 
 .include "../../mk/blas.buildlink3.mk"
 .include "../../math/metis/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
+.include "../../math/openblas/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/suitesparse/PLIST b/suitesparse/PLIST
index bce89e02ca..6b74e4000d 100644
--- a/suitesparse/PLIST
+++ b/suitesparse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/11/28 22:03:50 outpaddling Exp $
+@comment $NetBSD$
 include/suitesparse/SuiteSparseQR.hpp
 include/suitesparse/SuiteSparseQR_C.h
 include/suitesparse/SuiteSparseQR_definitions.h
@@ -11,71 +11,40 @@ include/suitesparse/camd.h
 include/suitesparse/camd_internal.h
 include/suitesparse/ccolamd.h
 include/suitesparse/cholmod.h
-include/suitesparse/cholmod_blas.h
-include/suitesparse/cholmod_check.h
-include/suitesparse/cholmod_cholesky.h
-include/suitesparse/cholmod_complexity.h
-include/suitesparse/cholmod_config.h
-include/suitesparse/cholmod_core.h
 include/suitesparse/cholmod_internal.h
-include/suitesparse/cholmod_io64.h
-include/suitesparse/cholmod_matrixops.h
-include/suitesparse/cholmod_modify.h
-include/suitesparse/cholmod_partition.h
-include/suitesparse/cholmod_supernodal.h
 include/suitesparse/cholmod_template.h
+include/suitesparse/cholmod_types.h
 include/suitesparse/colamd.h
 include/suitesparse/cs.h
 include/suitesparse/klu.h
 include/suitesparse/klu_internal.h
 include/suitesparse/klu_version.h
 include/suitesparse/spqr.hpp
+include/suitesparse/spqr_cholmod_wrappers.hpp
+include/suitesparse/spqrgpu.hpp
 include/suitesparse/umfpack.h
-include/suitesparse/umfpack_col_to_triplet.h
-include/suitesparse/umfpack_defaults.h
-include/suitesparse/umfpack_free_numeric.h
-include/suitesparse/umfpack_free_symbolic.h
-include/suitesparse/umfpack_get_determinant.h
-include/suitesparse/umfpack_get_lunz.h
-include/suitesparse/umfpack_get_numeric.h
-include/suitesparse/umfpack_get_symbolic.h
-include/suitesparse/umfpack_global.h
-include/suitesparse/umfpack_load_numeric.h
-include/suitesparse/umfpack_load_symbolic.h
-include/suitesparse/umfpack_numeric.h
-include/suitesparse/umfpack_qsymbolic.h
-include/suitesparse/umfpack_report_control.h
-include/suitesparse/umfpack_report_info.h
-include/suitesparse/umfpack_report_matrix.h
-include/suitesparse/umfpack_report_numeric.h
-include/suitesparse/umfpack_report_perm.h
-include/suitesparse/umfpack_report_status.h
-include/suitesparse/umfpack_report_symbolic.h
-include/suitesparse/umfpack_report_triplet.h
-include/suitesparse/umfpack_report_vector.h
-include/suitesparse/umfpack_save_numeric.h
-include/suitesparse/umfpack_save_symbolic.h
-include/suitesparse/umfpack_scale.h
-include/suitesparse/umfpack_solve.h
-include/suitesparse/umfpack_symbolic.h
-include/suitesparse/umfpack_tictoc.h
-include/suitesparse/umfpack_timer.h
-include/suitesparse/umfpack_transpose.h
-include/suitesparse/umfpack_triplet_to_col.h
-include/suitesparse/umfpack_wsolve.h
 include/ufsparse
 lib/libamd.a
 lib/libbtf.a
 lib/libcamd.a
 lib/libccolamd.a
-lib/libcerbla.a
 lib/libcholmod.a
 lib/libcolamd.a
 lib/libcsparse.a
 lib/libcxsparse.a
 lib/libklu.a
+lib/libklu_cholmod.a
+lib/liblagraph.a
+lib/liblagraphtest.a
+lib/liblagraphx.a
+lib/liblagraphxtest.a
 lib/libldl.a
+lib/libmyfort.a
+lib/libparu.a
 lib/librbio.a
+lib/libspex.a
 lib/libspqr.a
+lib/libsuitesparse_mongoose.a
 lib/libsuitesparseconfig.a
+lib/libsymbols.a
 lib/libumfpack.a
diff --git a/suitesparse/distinfo b/suitesparse/distinfo
index ceda1a38d5..d23bfead1a 100644
--- a/suitesparse/distinfo
+++ b/suitesparse/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2012/11/12 03:11:32 outpaddling Exp $
+$NetBSD$
 
-RMD160 (SuiteSparse-4.0.2.tar.gz) = 69b7becaba2cd26edc13d182bf59a8d6ac38b90b
-Size (SuiteSparse-4.0.2.tar.gz) = 22421100 bytes
-SHA1 (patch-SPQR_Source_spqr__factorize.cpp) = bbd599ef35d7c321a13c33bf5bcb49ffed3c5abb
-SHA1 (patch-UFconfig-UFconfig.mk) = e0f1c891f145e13af73331892ce24dea3cd267e9
+BLAKE2s (SuiteSparse-7.7.0.tar.gz) = ea9bc6eb64c7e24f68c1b5e9590b36f5d195a8ec7d0b919b55678f0455a8c980
+SHA512 (SuiteSparse-7.7.0.tar.gz) = aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451
+Size (SuiteSparse-7.7.0.tar.gz) = 85876065 bytes
+SHA1 (patch-GraphBLAS_CMakeLists.txt) = cb237ad5870615abc124ced12758cad4c893d1d1
+SHA1 (patch-SPQR_Source_spqr__factorize.cpp) = 9bb9369f9a7cac2584ea0426c847ade3fa724566
diff --git a/suitesparse/patches/patch-GraphBLAS_CMakeLists.txt b/suitesparse/patches/patch-GraphBLAS_CMakeLists.txt
new file mode 100644
index 0000000000..d88617bcc3
--- /dev/null
+++ b/suitesparse/patches/patch-GraphBLAS_CMakeLists.txt
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- GraphBLAS/CMakeLists.txt.orig	2024-03-26 21:14:00.000000000 +0000
++++ GraphBLAS/CMakeLists.txt
+@@ -125,7 +125,7 @@ endif ( )
+ # find cpu_features
+ #-------------------------------------------------------------------------------
+ 
+-if ( NOT GBNCPUFEAT )
++if ( NOT GBNCPUFEAT AND NOT CMAKE_SYSTEM_NAME STREQUAL "NetBSD" )
+     # default: enable Google's cpu_features package
+     message ( STATUS "cpu_features (by google.com): enabled " )
+     include_directories ( "cpu_features/include" "cpu_features" "cpu_features/src" "cpu_features/include/internal" )
+@@ -412,7 +412,7 @@ if ( NOT NO_LIBM )
+ endif ( )
+ 
+ # libdl
+-if ( NOT WIN32 )
++if ( NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "NetBSD" )
+     if ( BUILD_SHARED_LIBS )
+         target_link_libraries ( GraphBLAS PRIVATE dl )
+     endif ( )
diff --git a/suitesparse/patches/patch-SPQR_Source_spqr__factorize.cpp b/suitesparse/patches/patch-SPQR_Source_spqr__factorize.cpp
index 9e79f79575..076d153f5f 100644
--- a/suitesparse/patches/patch-SPQR_Source_spqr__factorize.cpp
+++ b/suitesparse/patches/patch-SPQR_Source_spqr__factorize.cpp
@@ -1,9 +1,8 @@
 $NetBSD: patch-SPQR_Source_spqr__factorize.cpp,v 1.1.1.1 2012/03/27 16:19:22 outpaddling Exp $
 
-# From FreeBSD
---- SPQR/Source/spqr_factorize.cpp.orig	2009-11-19 23:00:07.000000000 +0000
+--- SPQR/Source/spqr_factorize.cpp.orig	2024-03-26 21:14:00.000000000 +0000
 +++ SPQR/Source/spqr_factorize.cpp
-@@ -31,6 +31,7 @@
+@@ -36,6 +36,7 @@
  // =============================================================================
  
  #include "spqr.hpp"
Prev by Date: py-internetarchive: Add v4.1.0
Next by Date: suitesparse: removed worthless option
Previous by Thread: py-internetarchive: Add v4.1.0
Next by Thread: suitesparse: removed worthless option
Indexes:
Home | Main Index | Thread Index | Old Index