From nobody Sun Nov 27 11:10:05 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NKm8s6MrWz4hZYK; Sun, 27 Nov 2022 11:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NKm8s5fc0z4Mtn; Sun, 27 Nov 2022 11:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669547405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Z4sTcju6tVf/1e7aiY5Ypl8g88CXL0EC0RRH4O0XVI=; b=WcwkdZguLYW78JDKfyIhNxGdZwlNu6XioWc7i8KLyxwk0Ls7d9mG6YDl7Ie1CGYWwzRo8u AMZcZPbZODRq0JwBuETFxM44t0JpBH0PlURlwusff9egWlp9JhM94b8yYFw3EP26WuISdc Ed1y3JxQz1Mpc3bPGoEKlL4XAgn+M1EBcIPPcJgClUSPD3s3f8LA4djgh6UhGXlqy0lvKR r3sZR3TS/3LML7B1dR+hXbrJPhr2JMqUjeav+d5/b11fRBcRnn9m5B8rREvcEueBZOXA7l y1zAakDXtyUuXmfq2Xiar38VeDOQiLPrgHLHc+SwZ3QbviU3LJ7UDd/Ktb6h+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669547405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Z4sTcju6tVf/1e7aiY5Ypl8g88CXL0EC0RRH4O0XVI=; b=DOuXEk7vrhKaLZZYqcBqeBFFsWMKmTNXi5RrNP4sZ9z8g4TZnK6vb4PZk4Dv31ZUtR3woQ ILJ/vlIdMVSAFwgSkaEhqd9MVGASJPwGOBleuRcmcDwN/He2cnFRScCMzSQxRi1JmZADmx 5QAscrJ74vayrkDqiTtLoh2j33fH9Ub8cFgZHkgmQ16gZOylZtIud6krMKVEO8PQzKgysf UxaYX60XQHaRBSwiOmZRnBNJJwU5qEpvnCjrIInJWuL2+PYmByB77zaBp7RClHN0foIjTp uX1cVLJNRKVR/Iu5Fc1fMBQa5DWHpfo9QUt+Lm5svxMdIoMASasXY/BTaKDf8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669547405; a=rsa-sha256; cv=none; b=Q4MMeTssWXyPwMtnacbsRlGwIgAQUJks6fKFdhYLboUMLXmvg8nKHI5uzuJD+zL70WQFf6 5I+UduVehZNKuQ1drIzWKYZJak1txg1A2ILj5xE7x/3+tGQjVvkbfhUKYfazhVKY/cpsBX 0FUXi/fSgLrz2px23B7GjzWWbi9Gpu/BfZtcuJYHow8g+zcHwu4JVpas3/Gkst/TOxBx6L GX+Fs2paEglmNDwsXMFb4F1ueHK/GorhB0n4cK5/OCRGoUezQuVH8u2Sggr3RBXJO/PDCR V+xI0Yd2nnpB8qloFceqnKPsJJ/bZML7eKx05p3pDyHUV6UMWcwNagFu//psEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NKm8s4ktvzvvL; Sun, 27 Nov 2022 11:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ARBA5sN002211; Sun, 27 Nov 2022 11:10:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ARBA54c002208; Sun, 27 Nov 2022 11:10:05 GMT (envelope-from git) Date: Sun, 27 Nov 2022 11:10:05 GMT Message-Id: <202211271110.2ARBA54c002208@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 4102a16bf37a - main - math/suitesparse: upgrade to v6.0.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4102a16bf37aa5d548340028b7ffe5aebd978e18 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=4102a16bf37aa5d548340028b7ffe5aebd978e18 commit 4102a16bf37aa5d548340028b7ffe5aebd978e18 Author: Thierry Thomas AuthorDate: 2022-11-14 15:44:59 +0000 Commit: Thierry Thomas CommitDate: 2022-11-27 11:09:52 +0000 math/suitesparse: upgrade to v6.0.1 Release notes at . PR: 267742 --- math/suitesparse/Makefile | 4 +-- math/suitesparse/bsd.suitesparse.mk | 58 +++++++++---------------------------- math/suitesparse/distinfo | 6 ++-- 3 files changed, 18 insertions(+), 50 deletions(-) diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile index dccd2ad5540a..acf237b45cfb 100644 --- a/math/suitesparse/Makefile +++ b/math/suitesparse/Makefile @@ -1,5 +1,5 @@ PORTNAME= suitesparse -PORTVERSION= 5.13.0 +PORTVERSION= 6.0.1 CATEGORIES= math MAINTAINER= fortran@FreeBSD.org @@ -18,7 +18,7 @@ RUN_DEPENDS= suitesparse-amd>0:math/suitesparse-amd \ suitesparse-ldl>0:math/suitesparse-ldl \ suitesparse-mongoose>0:math/suitesparse-mongoose \ suitesparse-rbio>0:math/suitesparse-rbio \ - suitesparse-slip_lu>0:math/suitesparse-slip_lu \ + suitesparse-spex>0:math/suitesparse-spex \ suitesparse-spqr>0:math/suitesparse-spqr \ suitesparse-umfpack>0:math/suitesparse-umfpack .if !defined(PACKAGE_BUILDING) diff --git a/math/suitesparse/bsd.suitesparse.mk b/math/suitesparse/bsd.suitesparse.mk index c269a9936b26..1357cd83f010 100644 --- a/math/suitesparse/bsd.suitesparse.mk +++ b/math/suitesparse/bsd.suitesparse.mk @@ -4,7 +4,7 @@ PKGNAMEPREFIX= suitesparse- SSPNAME= suitesparse -SSPVERSION= 5.13.0 +SSPVERSION= 6.0.1 DISTVERSIONPREFIX= v MAINTAINER= fortran@FreeBSD.org @@ -19,10 +19,12 @@ DIST_SUBDIR= ${SSPNAME} WRKSRC= ${WRKDIR}/${GH_PROJECT}-${SSPVERSION} .if ${MPORTNAME} != config -BUILD_WRKSRC= ${WRKSRC}/${MPORTNAME} +CONFIGURE_WRKSRC=${WRKSRC}/${MPORTNAME} .else -BUILD_WRKSRC= ${WRKSRC}/SuiteSparse_config +CONFIGURE_WRKSRC=${WRKSRC}/SuiteSparse_config .endif +BUILD_WRKSRC= ${CONFIGURE_WRKSRC} +CMAKE_SOURCE_PATH= ${CONFIGURE_WRKSRC} .if ${MPORTNAME} != config && \ ${MPORTNAME} != CSparse && \ @@ -33,23 +35,17 @@ LIB_DEPENDS+= libsuitesparseconfig.so:math/suitesparse-config ${MPORTNAME} != BTF && \ ${MPORTNAME} != ssget OPTIONS_DEFINE+=DEMOS -.else -ALL_TARGET= library .endif -USES+= gmake +USES+= blaslapack:openblas cmake:insource fortran gmake DOCSDIR= ${PREFIX}/share/doc/${SSPNAME} -MAKE_ENV= BLAS="${BLASLIB}" LAPACK="${LAPACKLIB}" \ - OPTIMIZATION="${OPTIMIZATION}" \ - MY_METIS_LIB="-lmetis" \ - JOBS="${MAKE_JOBS_NUMBER}" \ +MAKE_ENV= JOBS="${MAKE_JOBS_NUMBER}" \ CMAKE_OPTIONS='${CMAKE_ARGS}' \ INSTALL="${STAGEDIR}${PREFIX}" \ INSTALL_DOC="${STAGEDIR}${DOCSDIR}" \ INSTALL_INCLUDE="${STAGEDIR}${PREFIX}/include/${SSPNAME}" -CMAKE_ARGS= -DCMAKE_INSTALL_INCLUDEDIR:PATH="include/${SSPNAME}" \ - -DBUILD_GRB_STATIC_LIBRARY:BOOL=ON +CMAKE_ARGS+= -DCMAKE_INSTALL_INCLUDEDIR:PATH="include/${SSPNAME}" LDFLAGS+= -L${WRKSRC}/lib # prevent linking with shared libs from the preinstalled older versions INSTALL_TARGET= install # skip USES=cmake @@ -61,7 +57,6 @@ DISTINFO_FILE= ${.CURDIR}/../../math/suitesparse/distinfo OPTIONS_DEFINE+= DOCS OPTIMIZED_CFLAGS OPTIONS_DEFAULT+= OPTIMIZED_CFLAGS -.if defined(BLAS_NEEDED) OPTIONS_RADIO+= BLAS OPTIONS_RADIO_BLAS+= ATLAS GOTOBLAS NETLIB OPENBLAS OPTIONS_DEFAULT+= OPENBLAS @@ -71,9 +66,7 @@ GOTOBLAS_DESC= Goto blas implementation GOTOBLAS_USES= blaslapack:gotoblas NETLIB_USES= blaslapack:netlib OPENBLAS_USES= blaslapack:openblas -.endif -.if defined(OMP_NEEDED) OPTIONS_DEFINE+= OPENMP OPTIONS_EXCLUDE_aarch64= OPENMP OPTIONS_EXCLUDE_armv7= OPENMP @@ -85,46 +78,21 @@ OPENMP_MAKE_ENV_OFF= CFOPENMP= # XXX ports/199603: LLVM openmp in base doesn't support armv6, armv7 yet OPENMP_VARS= OPENMP=gcc- . endif -.endif +OPENMP_CMAKE_BOOL= OPENMP +OPENMP_CMAKE_BOOL_OFF= NOPENMP DEMOS_DESC= Build the demonstrations -.if ${MPORTNAME} == Mongoose -DEMOS_ALL_TARGET= default -.else -DEMOS_ALL_TARGET= all -.endif -DEMOS_ALL_TARGET_OFF= library +DEMOS_CMAKE_BOOL= DEMO .if !defined(WITH_DEBUG) -OPTIMIZED_CFLAGS_VARS= OPTIMIZATION="-O3" +OPTIMIZED_CFLAGS_CFLAGS= -O3 +OPTIMIZED_CFLAGS_CXXFLAGS= -O3 LDFLAGS+= -s .endif post-extract: ${RM} -r ${WRKSRC}/metis-* -.if ${MPORTNAME} == AMD || \ - ${MPORTNAME} == CAMD || \ - ${MPORTNAME} == CCOLAMD || \ - ${MPORTNAME} == CHOLMOD || \ - ${MPORTNAME} == COLAMD || \ - ${MPORTNAME} == CSparse || \ - ${MPORTNAME} == CXSparse_newfiles || \ - ${MPORTNAME} == CXSparse || \ - ${MPORTNAME} == GPUQREngine || \ - ${MPORTNAME} == KLU || \ - ${MPORTNAME} == LDL || \ - ${MPORTNAME} == RBio || \ - ${MPORTNAME} == SPQR || \ - ${MPORTNAME} == UMFPACK -pre-configure: - ${REINPLACE_CMD} -e 's|-I../../include|-I${STAGEDIR}${PREFIX}/include/suitesparse -I../../SuiteSparse_config -I../../AMD/Include -I../../COLAMD/Include -I../../BTF/Include -I../../CHOLMOD/Include|;\ - s|-lsuitesparseconfig|-lsuitesparseconfig -L${LOCALBASE}/lib|' \ - ${BUILD_WRKSRC}/Demo/Makefile -.endif - -do-configure: # skip USES=cmake - post-install: .if ! ${MPORTNAME} == config @${RM} ${STAGEDIR}${DOCSDIR}/SUITESPARSECONFIG_README.txt \ diff --git a/math/suitesparse/distinfo b/math/suitesparse/distinfo index eeb4bb5cdc4f..6f104ee81b42 100644 --- a/math/suitesparse/distinfo +++ b/math/suitesparse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662122241 -SHA256 (suitesparse/v5.13.0.tar.gz) = 59c6ca2959623f0c69226cf9afb9a018d12a37fab3a8869db5f6d7f83b6b147d -SIZE (suitesparse/v5.13.0.tar.gz) = 65007609 +TIMESTAMP = 1668436115 +SHA256 (suitesparse/v6.0.1.tar.gz) = 06f55a0449775d1f43d8a33ba8c8417ea8cf76c27833b465c49825baa8741d0c +SIZE (suitesparse/v6.0.1.tar.gz) = 64831809