From nobody Sun Nov 27 11:10:23 2022 X-Original-To: dev-commits-ports-all@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 4NKm9C2pncz4hZVj; Sun, 27 Nov 2022 11:10:23 +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 4NKm9C26Fqz4P2m; Sun, 27 Nov 2022 11:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669547423; 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=31agTLpGz3IhWl2H8LU1hVERxdZg2g36R4ZcXGl1hGo=; b=DrN6qioA1RFsnSUtEcLalaZIM550PNVFKXisEcVUdle63HW8URC8t9itd3+Ti05H7xxPIn rKgueCty/sz3BCg2bGSPUca/t/M97bCIIa/qIhACqdmBfTQgz6IESB6vTsEdv+74fTuRBR rGScvS9HsUMw7NndLqFRRJEnUw8bQheu+p0Tpw9LoQdXYk2lSzb2Mdlc+hUGS7KQ4icJ3D kv5xFOn1MRH27NleZAjLjI1jd0UPeA97tQlVSmRUPIji8N/zFg5XXQiyH7G+WW/SqwOAg2 GT4TPmzGMAm00Vos0QIR64ZFxaUnWRijOsrNQl6nbfOghbKE0kYWSUBmgQ0beA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669547423; 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=31agTLpGz3IhWl2H8LU1hVERxdZg2g36R4ZcXGl1hGo=; b=Qh+FbK1YB0ggCjpKZlTUBf2Ys2E6zp3BdeDw8B5O2UDDnPePJNG72DNz3D/HoA9eJEw2em 2KegwVDzu+u9NjQvYeP0r67fIGmqUCtqxN8WhXJJOwknYcRf5kXk8qxFw5UZzt5KfSlhRg HYITGi42zbgM17ZfJUWXJi7syr5hHKP2PnYokW9M0fYU3NE2R0JlyUxFHPG173cyDjM/5J NtSYvHf18d+mzp5UhWY3Ch6Oav7Lbw0F/FRQgtVwg055KjkMcv1H0bMwreqWoTsvcX+L8O EazPwBiWY7lHKhmvJFFsDcxh5kna1gFmaGTMzEv+HIyypeYEYUzhxYieoQBDkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669547423; a=rsa-sha256; cv=none; b=C0WR8+YNCTTQj9N6mc3wtb8fSJSJyidVAKQjuWAZ0TFH8LPAY0CavfQoQpY2qfK/zJ9rIx DrGuvxvlcGkAyaWCZXy0JODrUo/JLutx4Z/lMkd+nA9vte4SyOlacmCn4xNiiWdTVDKGUX M7TvLeeNhDbgr/SDiW0F1N9IgCHHcrYeeBz1jiGZVKyPKu3y+7MMjjCuebUAgXneg7ewJW VF2Ei/QGnRDdDE/ZdN34PT5JPhnAp7JXg9BbQoOkaWDi3bUe4TnafWf6aBDdK+knR+QKpc LDRxbaA6AGEHjHKBH/tobkrVm+LJ3WS7JJawmgci9HPviSLDwR8EiYpb/KCSNw== 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 4NKm9C1BDXzvvN; Sun, 27 Nov 2022 11:10:23 +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 2ARBANmu008301; Sun, 27 Nov 2022 11:10:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ARBANRA008300; Sun, 27 Nov 2022 11:10:23 GMT (envelope-from git) Date: Sun, 27 Nov 2022 11:10:23 GMT Message-Id: <202211271110.2ARBANRA008300@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: cd6e29309dc7 - main - math/suitesparse-spqr: upgrade to 3.0.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: cd6e29309dc76ac6f111ee936b4262159dfe6870 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd6e29309dc76ac6f111ee936b4262159dfe6870 commit cd6e29309dc76ac6f111ee936b4262159dfe6870 Author: Thierry Thomas AuthorDate: 2022-11-14 17:19:53 +0000 Commit: Thierry Thomas CommitDate: 2022-11-27 11:09:56 +0000 math/suitesparse-spqr: upgrade to 3.0.1 PR: 267742 --- math/suitesparse-spqr/Makefile | 19 +++++++++---------- math/suitesparse-spqr/files/patch-SPQR_Demo_Makefile | 15 --------------- math/suitesparse-spqr/pkg-plist | 8 +++++--- 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/math/suitesparse-spqr/Makefile b/math/suitesparse-spqr/Makefile index 4adf5854365e..70bf7609fe51 100644 --- a/math/suitesparse-spqr/Makefile +++ b/math/suitesparse-spqr/Makefile @@ -1,5 +1,5 @@ PORTNAME= ${MPORTNAME:tl} -PORTVERSION= 2.1.0 +PORTVERSION= 3.0.1 CATEGORIES= math COMMENT= Sparse QR factorization @@ -14,18 +14,17 @@ LIB_DEPENDS= libamd.so:math/suitesparse-amd \ libcholmod.so:math/suitesparse-cholmod USES= localbase:ldflags -BLAS_NEEDED= yes -OMP_NEEDED= yes MPORTNAME= SPQR USE_LDCONFIG= yes -# See https://github.com/DrTimothyAldenDavis/SuiteSparse/issues/72 and PR 252651 -#OPTIONS_DEFINE+= TBB -#OPTIONS_DEFAULT+= TBB -#TBB_DESC= Intel threading building blocks -#TBB_LIB_DEPENDS= libtbb.so:devel/tbb -#TBB_MAKE_ENV= TBB="-ltbb" SPQR_CONFIG="-DHAVE_TBB" - .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk" + +post-stage-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt \ + ${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt + ${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/spqr_user_guide.pdf \ + ${STAGEDIR}${DOCSDIR} + .include diff --git a/math/suitesparse-spqr/files/patch-SPQR_Demo_Makefile b/math/suitesparse-spqr/files/patch-SPQR_Demo_Makefile deleted file mode 100644 index ce057a7eeab4..000000000000 --- a/math/suitesparse-spqr/files/patch-SPQR_Demo_Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- SPQR/Demo/Makefile.orig 2021-05-17 01:04:52 UTC -+++ SPQR/Demo/Makefile -@@ -126,12 +126,6 @@ gpu4: qrdemo_gpu - - library: metis - ( cd ../Lib ; $(MAKE) ) -- ( cd ../../AMD ; $(MAKE) library ) -- ( cd ../../SuiteSparse_config ; $(MAKE) library ) -- - ( cd ../../CHOLMOD && $(MAKE) library ) -- - ( cd ../../COLAMD && $(MAKE) library ) -- - ( cd ../../CCOLAMD && $(MAKE) library ) -- - ( cd ../../CAMD && $(MAKE) library ) - ifneq ($(GPU_CONFIG),) - - ( cd ../../SuiteSparse_GPURuntime && $(MAKE) library ) - - ( cd ../../GPUQREngine && $(MAKE) library ) diff --git a/math/suitesparse-spqr/pkg-plist b/math/suitesparse-spqr/pkg-plist index c4a47be52642..f7947c7fb120 100644 --- a/math/suitesparse-spqr/pkg-plist +++ b/math/suitesparse-spqr/pkg-plist @@ -1,9 +1,11 @@ include/suitesparse/SuiteSparseQR.hpp include/suitesparse/SuiteSparseQR_C.h include/suitesparse/SuiteSparseQR_definitions.h -include/suitesparse/spqr.hpp +lib/cmake/SuiteSparse/FindSPQR.cmake +lib/cmake/SuiteSparse/FindSPQR_CUDA.cmake +lib/libspqr.a lib/libspqr.so -lib/libspqr.so.2 -lib/libspqr.so.2.1.0 +lib/libspqr.so.3 +lib/libspqr.so.3.0.1 %%PORTDOCS%%%%DOCSDIR%%/SPQR_README.txt %%PORTDOCS%%%%DOCSDIR%%/spqr_user_guide.pdf