From 5c0c6e856ec24a4c3cf855cdd8aeb161abd8318a Mon Sep 17 00:00:00 2001 From: thor Date: Thu, 10 Jun 2021 00:18:52 +0000 Subject: math/lapack, math/cblas, math/lapacke: Remove premature cmake files from install Those cmake config files are not useful for us and they are incorrect for the upcoming 64-bit-index variants. Also, we could switch back to the Makefile build from cmake in future. Let's treat the question of CMake as implementation detail of the packages. The actual use is via mk/blas.bl3 in pkgsrc and pkg-config. There isn't even added value in these files, were they to be correct. CMake builds can use pkg-config just fine. --- math/cblas/Makefile | 6 ++++-- math/cblas/PLIST | 4 +--- math/lapack/Makefile | 3 ++- math/lapack/Makefile.common | 6 +++++- math/lapack/PLIST | 6 +----- math/lapacke/Makefile | 6 ++++-- math/lapacke/PLIST | 4 +--- 7 files changed, 18 insertions(+), 17 deletions(-) (limited to 'math') diff --git a/math/cblas/Makefile b/math/cblas/Makefile index 926ecafecf8..4415d90a470 100644 --- a/math/cblas/Makefile +++ b/math/cblas/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2021/04/20 20:37:03 thor Exp $ +# $NetBSD: Makefile,v 1.2 2021/06/10 00:18:52 thor Exp $ + +COMMENT= C interface to a BLAS library +PKGREVISION= 1 -COMMENT= C interface to a BLAS library LAPACK_COMPONENT= cblas LAPACK_COMPONENT_CMAKE_ARGS= \ -DUSE_OPTIMIZED_BLAS=ON \ diff --git a/math/cblas/PLIST b/math/cblas/PLIST index 9884fc2f344..099b42c166a 100644 --- a/math/cblas/PLIST +++ b/math/cblas/PLIST @@ -1,10 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2021/04/20 20:37:03 thor Exp $ +@comment $NetBSD: PLIST,v 1.2 2021/06/10 00:18:52 thor Exp $ include/cblas.h include/cblas_f77.h include/cblas_mangling.h include/cblas_test.h -lib/cmake/cblas-${PKGVERSION}/cblas-config-version.cmake -lib/cmake/cblas-${PKGVERSION}/cblas-config.cmake lib/libcblas.a lib/libcblas.so lib/libcblas.so.3 diff --git a/math/lapack/Makefile b/math/lapack/Makefile index 0b60a88fa32..34da6f67ecf 100644 --- a/math/lapack/Makefile +++ b/math/lapack/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2021/05/12 14:32:51 thor Exp $ +# $NetBSD: Makefile,v 1.44 2021/06/10 00:18:52 thor Exp $ MAINTAINER= thomas.orgis@uni-hamburg.de COMMENT= Linear Algebra PACKage (Netlib reference implementation) +PKGREVISION= 1 LAPACK_COMPONENT= lapack LAPACK_COMPONENT_CMAKE_ARGS= \ diff --git a/math/lapack/Makefile.common b/math/lapack/Makefile.common index cfe81228474..61868046984 100644 --- a/math/lapack/Makefile.common +++ b/math/lapack/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2020/10/12 21:51:57 bacon Exp $ +# $NetBSD: Makefile.common,v 1.13 2021/06/10 00:18:52 thor Exp $ # used by math/blas/Makefile # used by math/cblas/Makefile # used by math/lapacke/Makefile @@ -41,3 +41,7 @@ CMAKE_ARGS= -DBUILD_DEPRECATED=ON \ post-extract: ${RUN} ${MKDIR} ${WRKSRC}/build + +# The cmake files are not ready for prime time. +post-install: + rm -rf "${DESTDIR}${PREFIX}/lib/cmake" diff --git a/math/lapack/PLIST b/math/lapack/PLIST index 9b1dfa08dcc..6cec076e634 100644 --- a/math/lapack/PLIST +++ b/math/lapack/PLIST @@ -1,8 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2020/10/12 21:51:57 bacon Exp $ -lib/cmake/lapack-${PKGVERSION}/lapack-config-version.cmake -lib/cmake/lapack-${PKGVERSION}/lapack-config.cmake -lib/cmake/lapack-${PKGVERSION}/lapack-targets-release.cmake -lib/cmake/lapack-${PKGVERSION}/lapack-targets.cmake +@comment $NetBSD: PLIST,v 1.6 2021/06/10 00:18:52 thor Exp $ lib/liblapack.a lib/liblapack.so lib/liblapack.so.3 diff --git a/math/lapacke/Makefile b/math/lapacke/Makefile index b414a4ed5b3..789f184a169 100644 --- a/math/lapacke/Makefile +++ b/math/lapacke/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2021/04/20 20:40:47 thor Exp $ +# $NetBSD: Makefile,v 1.2 2021/06/10 00:18:52 thor Exp $ + +COMMENT= C interface to a LAPACK library +PKGREVISION= 1 -COMMENT= C interface to a LAPACK library LAPACK_COMPONENT= lapacke LAPACK_COMPONENT_CMAKE_ARGS= \ -DUSE_OPTIMIZED_BLAS=ON \ diff --git a/math/lapacke/PLIST b/math/lapacke/PLIST index 051102909d4..9b4ba2d6db6 100644 --- a/math/lapacke/PLIST +++ b/math/lapacke/PLIST @@ -1,11 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2021/04/20 20:40:47 thor Exp $ +@comment $NetBSD: PLIST,v 1.2 2021/06/10 00:18:52 thor Exp $ include/lapack.h include/lapacke.h include/lapacke_config.h include/lapacke_mangling.h include/lapacke_utils.h -lib/cmake/lapacke-${PKGVERSION}/lapacke-config-version.cmake -lib/cmake/lapacke-${PKGVERSION}/lapacke-config.cmake lib/liblapacke.a lib/liblapacke.so lib/liblapacke.so.3 -- cgit v1.2.3