CVS commit: pkgsrc/math

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Thu Jun 10 00:18:53 UTC 2021

Modified Files:
        pkgsrc/math/cblas: Makefile PLIST
        pkgsrc/math/lapack: Makefile Makefile.common PLIST
        pkgsrc/math/lapacke: Makefile PLIST

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/cblas/Makefile pkgsrc/math/cblas/PLIST
cvs rdiff -u -r1.43 -r1.44 pkgsrc/math/lapack/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/math/lapack/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/lapack/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/lapacke/Makefile \
    pkgsrc/math/lapacke/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/cblas/Makefile
diff -u pkgsrc/math/cblas/Makefile:1.1 pkgsrc/math/cblas/Makefile:1.2
--- pkgsrc/math/cblas/Makefile:1.1      Tue Apr 20 20:37:03 2021
+++ pkgsrc/math/cblas/Makefile  Thu Jun 10 00:18:52 2021
@@ -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 \
Index: pkgsrc/math/cblas/PLIST
diff -u pkgsrc/math/cblas/PLIST:1.1 pkgsrc/math/cblas/PLIST:1.2
--- pkgsrc/math/cblas/PLIST:1.1 Tue Apr 20 20:37:03 2021
+++ pkgsrc/math/cblas/PLIST     Thu Jun 10 00:18:52 2021
@@ -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

Index: pkgsrc/math/lapack/Makefile
diff -u pkgsrc/math/lapack/Makefile:1.43 pkgsrc/math/lapack/Makefile:1.44
--- pkgsrc/math/lapack/Makefile:1.43    Wed May 12 14:32:51 2021
+++ pkgsrc/math/lapack/Makefile Thu Jun 10 00:18:52 2021
@@ -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= \

Index: pkgsrc/math/lapack/Makefile.common
diff -u pkgsrc/math/lapack/Makefile.common:1.12 pkgsrc/math/lapack/Makefile.common:1.13
--- pkgsrc/math/lapack/Makefile.common:1.12     Mon Oct 12 21:51:57 2020
+++ pkgsrc/math/lapack/Makefile.common  Thu Jun 10 00:18:52 2021
@@ -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"

Index: pkgsrc/math/lapack/PLIST
diff -u pkgsrc/math/lapack/PLIST:1.5 pkgsrc/math/lapack/PLIST:1.6
--- pkgsrc/math/lapack/PLIST:1.5        Mon Oct 12 21:51:57 2020
+++ pkgsrc/math/lapack/PLIST    Thu Jun 10 00:18:52 2021
@@ -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

Index: pkgsrc/math/lapacke/Makefile
diff -u pkgsrc/math/lapacke/Makefile:1.1 pkgsrc/math/lapacke/Makefile:1.2
--- pkgsrc/math/lapacke/Makefile:1.1    Tue Apr 20 20:40:47 2021
+++ pkgsrc/math/lapacke/Makefile        Thu Jun 10 00:18:52 2021
@@ -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 \
Index: pkgsrc/math/lapacke/PLIST
diff -u pkgsrc/math/lapacke/PLIST:1.1 pkgsrc/math/lapacke/PLIST:1.2
--- pkgsrc/math/lapacke/PLIST:1.1       Tue Apr 20 20:40:47 2021
+++ pkgsrc/math/lapacke/PLIST   Thu Jun 10 00:18:52 2021
@@ -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