Date: Sat, 4 Jul 2020 07:26:07 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541169 - head/math/suitesparse Message-ID: <202007040726.0647Q7bP064176@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sat Jul 4 07:26:06 2020 New Revision: 541169 URL: https://svnweb.freebsd.org/changeset/ports/541169 Log: - Upgrade to v5.8.0: release notes at <https://github.com/DrTimothyAldenDavis/SuiteSparse/releases/tag/v5.8.0 > - Optionnally build the demos (but do not install them) - Remove compiler:openmp which pulls an unneeded Gcc. Modified: head/math/suitesparse/Makefile head/math/suitesparse/distinfo head/math/suitesparse/pkg-plist Modified: head/math/suitesparse/Makefile ============================================================================== --- head/math/suitesparse/Makefile Sat Jul 4 07:16:42 2020 (r541168) +++ head/math/suitesparse/Makefile Sat Jul 4 07:26:06 2020 (r541169) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= suitesparse -PORTVERSION= 5.7.2 -PORTREVISION= 1 +PORTVERSION= 5.8.0 DISTVERSIONPREFIX= v CATEGORIES= math @@ -21,7 +20,6 @@ GH_PROJECT= SuiteSparse USES= cmake:insource fortran gmake localbase:ldflags USE_LDCONFIG= yes -ALL_TARGET= library # skip demos INSTALL_TARGET= install # skip USES=cmake MAKE_ENV= BLAS="${BLASLIB}" LAPACK="${LAPACKLIB}" \ MY_METIS_LIB="-lmetis" \ @@ -36,8 +34,8 @@ LDFLAGS+= -L${WRKSRC}/lib # prevent linking with share CONFLICTS_INSTALL= mongoose plinkseq # bin/mongoose -OPTIONS_DEFINE= DOCS OPENMP TBB -OPTIONS_RADIO= BLAS +OPTIONS_DEFINE= DEMOS DOCS OPENMP TBB +OPTIONS_RADIO= BLAS OPTIONS_RADIO_BLAS= ATLAS GOTOBLAS NETLIB OPENBLAS OPTIONS_DEFAULT= OPENBLAS OPENMP TBB @@ -47,17 +45,23 @@ GOTOBLAS_USES= blaslapack:gotoblas NETLIB_USES= blaslapack:netlib OPENBLAS_USES= blaslapack:openblas -OPENMP_USES= compiler:openmp OPENMP_MAKE_ENV_OFF= CFOPENMP= .if !exists(/usr/include/omp.h) # XXX ports/199603: LLVM openmp in base doesn't support aarch64, armv6, armv7 yet OPENMP_VARS= OPENMP=gcc- .endif +DEMOS_DESC= Install the demonstrations +DEMOS_ALL_TARGET= go +DEMOS_ALL_TARGET_OFF= library + TBB_DESC= Intel threading building blocks TBB_LIB_DEPENDS= libtbb.so:devel/tbb TBB_MAKE_ENV= TBB="-ltbb" SPQR_CONFIG="-DHAVE_TBB" +MODULES= AMD CAMD CCOLAMD CHOLMOD COLAMD CSparse CXSparse_newfiles \ + CXSparse GPUQREngine KLU LDL RBio SPQR UMFPACK + .include <bsd.port.options.mk> .if ${ARCH} == i386 @@ -67,17 +71,24 @@ LDFLAGS+= -latomic .elif defined(PPC_ABI) && ${PPC_ABI} == ELFv1 USE_GCC= yes .else -USES+= compiler:${OPENMP}c++11-lib +USES+= compiler:c++11-lib .endif post-extract: ${RM} -r ${WRKSRC}/metis-* -do-configure: # skip USES=cmake - post-patch-OPENMP-off: @${REINPLACE_CMD} -e '/find_package.*OpenMP/d' \ ${WRKSRC}/GraphBLAS/CMakeLists.txt + +pre-configure: +.for m in ${MODULES} + ${REINPLACE_CMD} -e 's|-I../../include|-I${STAGEDIR}${PREFIX}/include/suitesparse|;\ + s|-lsuitesparseconfig|-lsuitesparseconfig -L${LOCALBASE}/lib|' \ + ${WRKSRC}/${m}/Demo/Makefile +.endfor + +do-configure: # skip USES=cmake post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so Modified: head/math/suitesparse/distinfo ============================================================================== --- head/math/suitesparse/distinfo Sat Jul 4 07:16:42 2020 (r541168) +++ head/math/suitesparse/distinfo Sat Jul 4 07:26:06 2020 (r541169) @@ -1,3 +1,3 @@ -TIMESTAMP = 1586617989 -SHA256 (DrTimothyAldenDavis-SuiteSparse-v5.7.2_GH0.tar.gz) = fe3bc7c3bd1efdfa5cffffb5cebf021ff024c83b5daf0ab445429d3d741bd3ad -SIZE (DrTimothyAldenDavis-SuiteSparse-v5.7.2_GH0.tar.gz) = 57027884 +TIMESTAMP = 1593811165 +SHA256 (DrTimothyAldenDavis-SuiteSparse-v5.8.0_GH0.tar.gz) = 94a9b7134eb4dd82b97f1a22a6b464feb81e73af2dcdf683c6f252285191df1d +SIZE (DrTimothyAldenDavis-SuiteSparse-v5.8.0_GH0.tar.gz) = 58819484 Modified: head/math/suitesparse/pkg-plist ============================================================================== --- head/math/suitesparse/pkg-plist Sat Jul 4 07:16:42 2020 (r541168) +++ head/math/suitesparse/pkg-plist Sat Jul 4 07:26:06 2020 (r541169) @@ -2,6 +2,7 @@ bin/mongoose include/suitesparse/GraphBLAS.h include/suitesparse/Mongoose.hpp include/suitesparse/RBio.h +include/suitesparse/SLIP_LU.h include/suitesparse/SuiteSparseQR.hpp include/suitesparse/SuiteSparseQR_C.h include/suitesparse/SuiteSparseQR_definitions.h @@ -89,7 +90,7 @@ lib/libcxsparse.so.3.2.0 lib/libgraphblas.a lib/libgraphblas.so lib/libgraphblas.so.3 -lib/libgraphblas.so.3.2.2 +lib/libgraphblas.so.3.3.2 lib/libklu.so lib/libklu.so.1 lib/libklu.so.1.3.8 @@ -103,12 +104,15 @@ lib/libmongoose.so.2.0.4 lib/librbio.so lib/librbio.so.2 lib/librbio.so.2.2.6 +lib/libsliplu.so +lib/libsliplu.so.1 +lib/libsliplu.so.1.0.1 lib/libspqr.so lib/libspqr.so.2 lib/libspqr.so.2.0.9 lib/libsuitesparseconfig.so lib/libsuitesparseconfig.so.5 -lib/libsuitesparseconfig.so.5.7.2 +lib/libsuitesparseconfig.so.5.8.0 lib/libumfpack.so lib/libumfpack.so.5 lib/libumfpack.so.5.7.9 @@ -126,6 +130,8 @@ lib/libumfpack.so.5.7.9 %%PORTDOCS%%%%DOCSDIR%%/KLU_UserGuide.pdf %%PORTDOCS%%%%DOCSDIR%%/LDL_README.txt %%PORTDOCS%%%%DOCSDIR%%/RBIO_README.txt +%%PORTDOCS%%%%DOCSDIR%%/SLIP_LU_README.md +%%PORTDOCS%%%%DOCSDIR%%/SLIP_LU_UserGuide.pdf %%PORTDOCS%%%%DOCSDIR%%/SPQR_README.txt %%PORTDOCS%%%%DOCSDIR%%/SUITESPARSECONFIG_README.txt %%PORTDOCS%%%%DOCSDIR%%/SuiteSparse_README.md
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007040726.0647Q7bP064176>