git: cd6e29309dc7 - main - math/suitesparse-spqr: upgrade to 3.0.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 27 Nov 2022 11:10:23 UTC
The branch main has been updated by thierry:
URL: https://cgit.FreeBSD.org/ports/commit/?id=cd6e29309dc76ac6f111ee936b4262159dfe6870
commit cd6e29309dc76ac6f111ee936b4262159dfe6870
Author: Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2022-11-14 17:19:53 +0000
Commit: Thierry Thomas <thierry@FreeBSD.org>
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 <bsd.port.post.mk>
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