pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math math/lapack, math/cblas, math/lapacke: Remove pre...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b8f6154da981
branches:  trunk
changeset: 454339:b8f6154da981
user:      thor <thor%pkgsrc.org@localhost>
date:      Thu Jun 10 00:18:52 2021 +0000

description:
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.

diffstat:

 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(-)

diffs (102 lines):

diff -r 4a46068a5571 -r b8f6154da981 math/cblas/Makefile
--- a/math/cblas/Makefile       Wed Jun 09 20:50:12 2021 +0000
+++ b/math/cblas/Makefile       Thu Jun 10 00:18:52 2021 +0000
@@ -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
+COMMENT=       C interface to a BLAS library
+PKGREVISION=   1
+
 LAPACK_COMPONENT=      cblas
 LAPACK_COMPONENT_CMAKE_ARGS=   \
        -DUSE_OPTIMIZED_BLAS=ON \
diff -r 4a46068a5571 -r b8f6154da981 math/cblas/PLIST
--- a/math/cblas/PLIST  Wed Jun 09 20:50:12 2021 +0000
+++ b/math/cblas/PLIST  Thu Jun 10 00:18:52 2021 +0000
@@ -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 -r 4a46068a5571 -r b8f6154da981 math/lapack/Makefile
--- a/math/lapack/Makefile      Wed Jun 09 20:50:12 2021 +0000
+++ b/math/lapack/Makefile      Thu Jun 10 00:18:52 2021 +0000
@@ -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@localhost
 COMMENT=       Linear Algebra PACKage (Netlib reference implementation)
+PKGREVISION=   1
 
 LAPACK_COMPONENT=      lapack
 LAPACK_COMPONENT_CMAKE_ARGS= \
diff -r 4a46068a5571 -r b8f6154da981 math/lapack/Makefile.common
--- a/math/lapack/Makefile.common       Wed Jun 09 20:50:12 2021 +0000
+++ b/math/lapack/Makefile.common       Thu Jun 10 00:18:52 2021 +0000
@@ -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 @@
 
 post-extract:
        ${RUN} ${MKDIR} ${WRKSRC}/build
+
+# The cmake files are not ready for prime time.
+post-install:
+       rm -rf "${DESTDIR}${PREFIX}/lib/cmake"
diff -r 4a46068a5571 -r b8f6154da981 math/lapack/PLIST
--- a/math/lapack/PLIST Wed Jun 09 20:50:12 2021 +0000
+++ b/math/lapack/PLIST Thu Jun 10 00:18:52 2021 +0000
@@ -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 -r 4a46068a5571 -r b8f6154da981 math/lapacke/Makefile
--- a/math/lapacke/Makefile     Wed Jun 09 20:50:12 2021 +0000
+++ b/math/lapacke/Makefile     Thu Jun 10 00:18:52 2021 +0000
@@ -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
+COMMENT=       C interface to a LAPACK library
+PKGREVISION=   1
+
 LAPACK_COMPONENT=      lapacke
 LAPACK_COMPONENT_CMAKE_ARGS=   \
        -DUSE_OPTIMIZED_BLAS=ON \
diff -r 4a46068a5571 -r b8f6154da981 math/lapacke/PLIST
--- a/math/lapacke/PLIST        Wed Jun 09 20:50:12 2021 +0000
+++ b/math/lapacke/PLIST        Thu Jun 10 00:18:52 2021 +0000
@@ -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



Home | Main Index | Thread Index | Old Index