pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

suitesparse: reduce to the max.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Jun 6 22:11:50 2024 +0200
Changeset:	0b50cade6e578d62f7c121b3f7254aeb205a4a89

Modified Files:
	suitesparse/Makefile
	suitesparse/PLIST

Log Message:
suitesparse: reduce to the max.

Switch to a standard cmake build.

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

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

diffstat:
 suitesparse/Makefile | 106 ++-------------------------
 suitesparse/PLIST    | 197 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 184 insertions(+), 119 deletions(-)

diffs:
diff --git a/suitesparse/Makefile b/suitesparse/Makefile
index a086add6df..aecde566bb 100644
--- a/suitesparse/Makefile
+++ b/suitesparse/Makefile
@@ -1,125 +1,27 @@
 # $NetBSD: Makefile,v 1.12 2012/11/28 21:43:05 outpaddling Exp $
 
 DISTNAME=	SuiteSparse-7.7.0
-PKGNAME=	suitesparse-7.7.0
+PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GITHUB:=DrTimothyAldenDavis/}
-GITHUB_TAG=	refs/tags/v${PKGVERSION_NOREV}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.cise.ufl.edu/research/sparse/SuiteSparse/
 COMMENT=	Set of packages for sparse matrices calculation
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
-.include "../../mk/bsd.prefs.mk"
-
-CFLAGS+=	-O ${PTHREAD_CFLAGS} ${PICFLAG}
-
-.if ( ${MACHINE_ARCH} == "sparc" ) || ( ${MACHINE_ARCH} == "powerpc" )
-PICFLAG?=	-fPIC
-.else
-PICFLAG?=	-fpic
-.endif
-
-# Platforms without librt
-.if ${OPSYS} == "Darwin"
-LIB=		-lm
-.else
-LIB=		-lm -lrt
-.endif
-
-USE_TOOLS+=	gmake gsed
-
 USE_LANGUAGES=	c c++ fortran77
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-# Creating shared libs for all platforms is complicated.  Putting this off
-# for now.
-# WRKSRC_SHARED=${WRKSRC}_shared
-# SVERSION=	1
-
-.if defined (WITH_METIS)
-METIS=		${PREFIX}/lib/libmetis.a
-METIS_PATH=	${PREFIX}/include/metis
-CHOLMOD_CONFIG=
-.else
-CHOLMOD_CONFIG=	-DNPARTITION
-.endif
-
-AUTO_MKDIRS=		yes
-INSTALLATION_DIRS=	include/suitesparse lib
-
-# Non-standard variables used by SuiteSparse Makefiles
-MAKE_FLAGS+=	BLAS_LIBRARIES="${LDFLAGS} ${BLAS_LIBS}" \
-		CHOLMOD_CONFIG="${CHOLMOD_CONFIG}" \
-		CPLUSPLUS="${CXX}" \
-		CF="${CFLAGS} ${CXXFLAGS}" \
-		F77FLAGS="${FFLAGS} ${PICFLAG}" \
-		LAPACK="${LDFLAGS} ${LAPACK_LIBS}" \
-		METIS="${METIS}" \
-		METIS_PATH="${METIS_PATH}" \
-		SPQR_CONFIG="${CHOLMOD_CONFIG}" \
-		LIB="${LIB}" \
-
-post-patch:
-	${CP} ${FILESDIR}/SuiteSparse_config.mk ${WRKSRC}/SuiteSparse_config
-#	${FIND} ${WRKSRC} -type f \( -name 'Makefile' -o -name '*.mk' \) \
-		-exec gsed -i'.bak' -e '\|^AR =|s|ar|${AR}|' \
-			-e '\|^BLAS =|s|=.*|= ${LDFLAGS} ${BLAS_LIBS}|' \
-			-e '\|^CC =|d' \
-			-e '\|^CFLAGS =|{s|-O[1-9]\{0,1\}||g;s|=|= ${CFLAGS} $${PICFLAG} |;}' \
-			-e '\|^CHOLMOD_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
-			-e '\|^CPLUSPLUS =|s|=.*|= ${CXX}|' \
-			-e '\|^F77 =|d' \
-			-e '\|^F77FLAGS =|s|=.*|= ${FFLAGS} $${PICFLAG}|' \
-			-e '\|^LAPACK =|s|=.*|= ${LDFLAGS} ${LAPACK_LIBS}|' \
-			-e '\|^METIS =|s|=.*|= ${METIS}|' \
-			-e '\|^METIS_PATH =|s|=.*|= ${METIS_PATH}|' \
-			-e 's|-I\$$(METIS_PATH)/Lib|-I${METIS_PATH}|' \
-			-e '\|^RANLIB =|s|ranlib|${RANLIB}|' \
-			-e '\|^SPQR_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
-			-e 's|/usr/local|${PREFIX}|g' '{}' \;
-#	${CP} -r ${WRKSRC} ${WRKSRC_SHARED}
-
-do-build:
-	cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} PICFLAG= \
-		${GMAKE} ${_MAKE_JOBS} ${MAKE_FLAGS}
-
-#	cd ${WRKSRC_SHARED} ; ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \
-#		${GMAKE} ${_MAKE_JOBS} ${MAKE_FLAGS}
-
-# OS X ld does not support -Bshareable or --whole-archive
-# Find a portable way to add sonames
-#post-build:
-#	for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \
-#		j=$${i##*/} ; ${LD} -Bshareable -o $${i%.a}.so.${SVERSION} -x \
-#		-soname $${j%.a}.so.${SVERSION} --whole-archive $${i} ; \
-#	done
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/SuiteSparse_config/SuiteSparse_config.h \
-		${DESTDIR}${PREFIX}/include/suitesparse
-.for d in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CXSparse KLU SPQR UMFPACK
-	${INSTALL_DATA} ${WRKSRC}/${d}/Include/*.h ${DESTDIR}${PREFIX}/include/suitesparse
-.endfor
-	(cd ${DESTDIR}${PREFIX}/include && ${LN} -sf suitesparse ufsparse)
-	${INSTALL_DATA} ${WRKSRC}/SPQR/Include/*.hpp ${DESTDIR}${PREFIX}/include/suitesparse
-	for i in `find ${WRKSRC} -type f -name '*.a'` ; do \
-		${INSTALL_DATA} $${i} ${DESTDIR}${PREFIX}/lib ; \
-	done
-
-# Shared libs
-#	for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \
-#		${INSTALL_DATA} ${WRKSRC}/$${i##${WRKSRC_SHARED}/} \
-#		$${i%.a}.so.${SVERSION} ${DESTDIR}${PREFIX}/lib ; \
-#		j=$${i##*/} ;  ${LN} -sf $${j%.a}.so.${SVERSION} ${DESTDIR}${PREFIX}/lib/$${j%.a}.so ; \
-#	done
 
+.include "../../devel/cmake/build.mk"
 .include "../../mk/blas.buildlink3.mk"
 .include "../../math/metis/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
 .include "../../math/openblas/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+# XXX: file a bug report about this upstream
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 .include "../../parallel/openmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/suitesparse/PLIST b/suitesparse/PLIST
index 6b74e4000d..22be4373e4 100644
--- a/suitesparse/PLIST
+++ b/suitesparse/PLIST
@@ -1,50 +1,213 @@
 @comment $NetBSD$
+bin/suitesparse_mongoose
+include/suitesparse/GraphBLAS.h
+include/suitesparse/LAGraph.h
+include/suitesparse/LAGraphX.h
+include/suitesparse/Mongoose.hpp
+include/suitesparse/ParU.hpp
+include/suitesparse/ParU_C.h
+include/suitesparse/ParU_definitions.h
+include/suitesparse/RBio.h
+include/suitesparse/SPEX.h
 include/suitesparse/SuiteSparseQR.hpp
 include/suitesparse/SuiteSparseQR_C.h
 include/suitesparse/SuiteSparseQR_definitions.h
 include/suitesparse/SuiteSparse_config.h
 include/suitesparse/amd.h
-include/suitesparse/amd_internal.h
 include/suitesparse/btf.h
-include/suitesparse/btf_internal.h
 include/suitesparse/camd.h
-include/suitesparse/camd_internal.h
 include/suitesparse/ccolamd.h
 include/suitesparse/cholmod.h
-include/suitesparse/cholmod_internal.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/klu_cholmod.h
+include/suitesparse/ldl.h
+include/suitesparse/spex_python_connect.h
 include/suitesparse/umfpack.h
-include/ufsparse
+lib/cmake/AMD/AMDConfig.cmake
+lib/cmake/AMD/AMDConfigVersion.cmake
+lib/cmake/AMD/AMDTargets-release.cmake
+lib/cmake/AMD/AMDTargets.cmake
+lib/cmake/BTF/BTFConfig.cmake
+lib/cmake/BTF/BTFConfigVersion.cmake
+lib/cmake/BTF/BTFTargets-release.cmake
+lib/cmake/BTF/BTFTargets.cmake
+lib/cmake/CAMD/CAMDConfig.cmake
+lib/cmake/CAMD/CAMDConfigVersion.cmake
+lib/cmake/CAMD/CAMDTargets-release.cmake
+lib/cmake/CAMD/CAMDTargets.cmake
+lib/cmake/CCOLAMD/CCOLAMDConfig.cmake
+lib/cmake/CCOLAMD/CCOLAMDConfigVersion.cmake
+lib/cmake/CCOLAMD/CCOLAMDTargets-release.cmake
+lib/cmake/CCOLAMD/CCOLAMDTargets.cmake
+lib/cmake/CHOLMOD/CHOLMODConfig.cmake
+lib/cmake/CHOLMOD/CHOLMODConfigVersion.cmake
+lib/cmake/CHOLMOD/CHOLMODTargets-release.cmake
+lib/cmake/CHOLMOD/CHOLMODTargets.cmake
+lib/cmake/COLAMD/COLAMDConfig.cmake
+lib/cmake/COLAMD/COLAMDConfigVersion.cmake
+lib/cmake/COLAMD/COLAMDTargets-release.cmake
+lib/cmake/COLAMD/COLAMDTargets.cmake
+lib/cmake/CXSparse/CXSparseConfig.cmake
+lib/cmake/CXSparse/CXSparseConfigVersion.cmake
+lib/cmake/CXSparse/CXSparseTargets-release.cmake
+lib/cmake/CXSparse/CXSparseTargets.cmake
+lib/cmake/GraphBLAS/GraphBLASConfig.cmake
+lib/cmake/GraphBLAS/GraphBLASConfigVersion.cmake
+lib/cmake/GraphBLAS/GraphBLASTargets-release.cmake
+lib/cmake/GraphBLAS/GraphBLASTargets.cmake
+lib/cmake/KLU/KLUConfig.cmake
+lib/cmake/KLU/KLUConfigVersion.cmake
+lib/cmake/KLU/KLUTargets-release.cmake
+lib/cmake/KLU/KLUTargets.cmake
+lib/cmake/KLU_CHOLMOD/KLU_CHOLMODConfig.cmake
+lib/cmake/KLU_CHOLMOD/KLU_CHOLMODConfigVersion.cmake
+lib/cmake/KLU_CHOLMOD/KLU_CHOLMODTargets-release.cmake
+lib/cmake/KLU_CHOLMOD/KLU_CHOLMODTargets.cmake
+lib/cmake/LAGraph/FindGraphBLAS.cmake
+lib/cmake/LAGraph/LAGraphConfig.cmake
+lib/cmake/LAGraph/LAGraphConfigVersion.cmake
+lib/cmake/LAGraph/LAGraphTargets-release.cmake
+lib/cmake/LAGraph/LAGraphTargets.cmake
+lib/cmake/LDL/LDLConfig.cmake
+lib/cmake/LDL/LDLConfigVersion.cmake
+lib/cmake/LDL/LDLTargets-release.cmake
+lib/cmake/LDL/LDLTargets.cmake
+lib/cmake/ParU/ParUConfig.cmake
+lib/cmake/ParU/ParUConfigVersion.cmake
+lib/cmake/ParU/ParUTargets-release.cmake
+lib/cmake/ParU/ParUTargets.cmake
+lib/cmake/RBio/RBioConfig.cmake
+lib/cmake/RBio/RBioConfigVersion.cmake
+lib/cmake/RBio/RBioTargets-release.cmake
+lib/cmake/RBio/RBioTargets.cmake
+lib/cmake/SPEX/FindGMP.cmake
+lib/cmake/SPEX/FindMPFR.cmake
+lib/cmake/SPEX/SPEXConfig.cmake
+lib/cmake/SPEX/SPEXConfigVersion.cmake
+lib/cmake/SPEX/SPEXTargets-release.cmake
+lib/cmake/SPEX/SPEXTargets.cmake
+lib/cmake/SPQR/SPQRConfig.cmake
+lib/cmake/SPQR/SPQRConfigVersion.cmake
+lib/cmake/SPQR/SPQRTargets-release.cmake
+lib/cmake/SPQR/SPQRTargets.cmake
+lib/cmake/SuiteSparse/SuiteSparseBLAS.cmake
+lib/cmake/SuiteSparse/SuiteSparseBLAS32.cmake
+lib/cmake/SuiteSparse/SuiteSparseBLAS64.cmake
+lib/cmake/SuiteSparse/SuiteSparseLAPACK.cmake
+lib/cmake/SuiteSparse/SuiteSparsePolicy.cmake
+lib/cmake/SuiteSparse/SuiteSparseReport.cmake
+lib/cmake/SuiteSparse/SuiteSparse__thread.cmake
+lib/cmake/SuiteSparse_Mongoose/SuiteSparse_MongooseConfig.cmake
+lib/cmake/SuiteSparse_Mongoose/SuiteSparse_MongooseConfigVersion.cmake
+lib/cmake/SuiteSparse_Mongoose/SuiteSparse_MongooseTargets-release.cmake
+lib/cmake/SuiteSparse_Mongoose/SuiteSparse_MongooseTargets.cmake
+lib/cmake/SuiteSparse_config/SuiteSparse_configConfig.cmake
+lib/cmake/SuiteSparse_config/SuiteSparse_configConfigVersion.cmake
+lib/cmake/SuiteSparse_config/SuiteSparse_configTargets-release.cmake
+lib/cmake/SuiteSparse_config/SuiteSparse_configTargets.cmake
+lib/cmake/UMFPACK/UMFPACKConfig.cmake
+lib/cmake/UMFPACK/UMFPACKConfigVersion.cmake
+lib/cmake/UMFPACK/UMFPACKTargets-release.cmake
+lib/cmake/UMFPACK/UMFPACKTargets.cmake
 lib/libamd.a
+lib/libamd.so
+lib/libamd.so.3
+lib/libamd.so.3.3.2
 lib/libbtf.a
+lib/libbtf.so
+lib/libbtf.so.2
+lib/libbtf.so.2.3.2
 lib/libcamd.a
+lib/libcamd.so
+lib/libcamd.so.3
+lib/libcamd.so.3.3.2
 lib/libccolamd.a
+lib/libccolamd.so
+lib/libccolamd.so.3
+lib/libccolamd.so.3.3.3
 lib/libcholmod.a
+lib/libcholmod.so
+lib/libcholmod.so.5
+lib/libcholmod.so.5.2.1
 lib/libcolamd.a
-lib/libcsparse.a
+lib/libcolamd.so
+lib/libcolamd.so.3
+lib/libcolamd.so.3.3.3
 lib/libcxsparse.a
+lib/libcxsparse.so
+lib/libcxsparse.so.4
+lib/libcxsparse.so.4.4.0
+lib/libgraphblas.so
+lib/libgraphblas.so.9
+lib/libgraphblas.so.9.1.0
 lib/libklu.a
+lib/libklu.so
+lib/libklu.so.2
+lib/libklu.so.2.3.3
 lib/libklu_cholmod.a
+lib/libklu_cholmod.so
+lib/libklu_cholmod.so.2
+lib/libklu_cholmod.so.2.3.3
 lib/liblagraph.a
-lib/liblagraphtest.a
+lib/liblagraph.so
+lib/liblagraph.so.1
+lib/liblagraph.so.1.1.3
 lib/liblagraphx.a
-lib/liblagraphxtest.a
+lib/liblagraphx.so
+lib/liblagraphx.so.1
+lib/liblagraphx.so.1.1.3
 lib/libldl.a
-lib/libmyfort.a
+lib/libldl.so
+lib/libldl.so.3
+lib/libldl.so.3.3.2
 lib/libparu.a
+lib/libparu.so
+lib/libparu.so.0
+lib/libparu.so.0.1.3
 lib/librbio.a
+lib/librbio.so
+lib/librbio.so.4
+lib/librbio.so.4.3.2
 lib/libspex.a
+lib/libspex.so
+lib/libspex.so.3
+lib/libspex.so.3.1.0
+lib/libspexpython.so
+lib/libspexpython.so.3
+lib/libspexpython.so.3.1.0
 lib/libspqr.a
+lib/libspqr.so
+lib/libspqr.so.4
+lib/libspqr.so.4.3.3
 lib/libsuitesparse_mongoose.a
+lib/libsuitesparse_mongoose.so
+lib/libsuitesparse_mongoose.so.3
 lib/libsuitesparseconfig.a
-lib/libsymbols.a
+lib/libsuitesparseconfig.so
+lib/libsuitesparseconfig.so.7
+lib/libsuitesparseconfig.so.${PKGVERSION}
 lib/libumfpack.a
+lib/libumfpack.so
+lib/libumfpack.so.6
+lib/libumfpack.so.6.3.3
+lib/pkgconfig/AMD.pc
+lib/pkgconfig/BTF.pc
+lib/pkgconfig/CAMD.pc
+lib/pkgconfig/CCOLAMD.pc
+lib/pkgconfig/CHOLMOD.pc
+lib/pkgconfig/COLAMD.pc
+lib/pkgconfig/CXSparse.pc
+lib/pkgconfig/GraphBLAS.pc
+lib/pkgconfig/KLU.pc
+lib/pkgconfig/KLU_CHOLMOD.pc
+lib/pkgconfig/LAGraph.pc
+lib/pkgconfig/LDL.pc
+lib/pkgconfig/ParU.pc
+lib/pkgconfig/RBio.pc
+lib/pkgconfig/SPEX.pc
+lib/pkgconfig/SPQR.pc
+lib/pkgconfig/SuiteSparse_Mongoose.pc
+lib/pkgconfig/SuiteSparse_config.pc
+lib/pkgconfig/UMFPACK.pc


Home | Main Index | Thread Index | Old Index