Mon May 17 11:31:29 2021 UTC ()
math/lapack: remove spurious hook from lokal build in  CMake patch

This added a rather irrelevant local search path and just polluted
the patch with a local directory from by builds.


(thor)
diff -r1.26 -r1.27 pkgsrc/math/lapack/distinfo
diff -r1.3 -r1.4 pkgsrc/math/lapack/patches/patch-CMakeLists.txt
cvs diff -r1.26 -r1.27 pkgsrc/math/lapack/distinfo (expand / switch to unified diff)

--- pkgsrc/math/lapack/distinfo 2021/05/13 07:52:05 1.26
+++ pkgsrc/math/lapack/distinfo 2021/05/17 11:31:29 1.27
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1$NetBSD: distinfo,v 1.26 2021/05/13 07:52:05 thor Exp $ 1$NetBSD: distinfo,v 1.27 2021/05/17 11:31:29 thor Exp $
2 2
3SHA1 (lapack-3.9.1.tar.gz) = ccb1e9cb6e7fa7db8a680292457d7d990f25d286 3SHA1 (lapack-3.9.1.tar.gz) = ccb1e9cb6e7fa7db8a680292457d7d990f25d286
4RMD160 (lapack-3.9.1.tar.gz) = 380a2072eb7d8358ec8bf100e3d114600fc71444 4RMD160 (lapack-3.9.1.tar.gz) = 380a2072eb7d8358ec8bf100e3d114600fc71444
5SHA512 (lapack-3.9.1.tar.gz) = 1c70892ce22eb1f5c0be1e0384d00dc876622e6254e853616eb7c0379c5d1ecf2f1f94d06389dbfba06b78484daf625d899306a9dc0b31a0646320c814022fdb 5SHA512 (lapack-3.9.1.tar.gz) = 1c70892ce22eb1f5c0be1e0384d00dc876622e6254e853616eb7c0379c5d1ecf2f1f94d06389dbfba06b78484daf625d899306a9dc0b31a0646320c814022fdb
6Size (lapack-3.9.1.tar.gz) = 7543209 bytes 6Size (lapack-3.9.1.tar.gz) = 7543209 bytes
7SHA1 (patch-BLAS_SRC_CMakeLists.txt) = 8773f93b1f907ed02d41677a3819f5bb655a331a 7SHA1 (patch-BLAS_SRC_CMakeLists.txt) = 8773f93b1f907ed02d41677a3819f5bb655a331a
8SHA1 (patch-CBLAS_cblas.pc.in) = cc97fbab08024220739929b5ad95c266965da06d 8SHA1 (patch-CBLAS_cblas.pc.in) = cc97fbab08024220739929b5ad95c266965da06d
9SHA1 (patch-CBLAS_src_CMakeLists.txt) = 64abbfb4458943483fba8897df0c8bf62c3f949e 9SHA1 (patch-CBLAS_src_CMakeLists.txt) = 64abbfb4458943483fba8897df0c8bf62c3f949e
10SHA1 (patch-CMakeLists.txt) = 37ec278c2349d79e8cbd7cff110fce7984b42e6e 10SHA1 (patch-CMakeLists.txt) = 3c8e9125f164625198fb7197982746f43bf4aab5
11SHA1 (patch-LAPACKE_CMakeLists.txt) = 13e4662585088aa53f61f7079d103fdfcf985c4e 11SHA1 (patch-LAPACKE_CMakeLists.txt) = 13e4662585088aa53f61f7079d103fdfcf985c4e
12SHA1 (patch-LAPACKE_lapacke.pc.in) = 6bbd72205120501cd60daf0b22b00ef7979fb329 12SHA1 (patch-LAPACKE_lapacke.pc.in) = 6bbd72205120501cd60daf0b22b00ef7979fb329
13SHA1 (patch-LAPACKE_src_CMakeLists.txt) = da39a3ee5e6b4b0d3255bfef95601890afd80709 
14SHA1 (patch-SRC_CMakeLists.txt) = 4031bb41100f1fde71c70aa53fc55bee7a852fb7 13SHA1 (patch-SRC_CMakeLists.txt) = 4031bb41100f1fde71c70aa53fc55bee7a852fb7
15SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 07946678945dba3a7752849791f12e0666345983 14SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 07946678945dba3a7752849791f12e0666345983
cvs diff -r1.3 -r1.4 pkgsrc/math/lapack/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/math/lapack/patches/patch-CMakeLists.txt 2021/05/13 07:52:05 1.3
+++ pkgsrc/math/lapack/patches/patch-CMakeLists.txt 2021/05/17 11:31:29 1.4
@@ -1,30 +1,21 @@ @@ -1,30 +1,21 @@
1$NetBSD: patch-CMakeLists.txt,v 1.3 2021/05/13 07:52:05 thor Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.4 2021/05/17 11:31:29 thor Exp $
2 2
3Avoid installation of LAPACK CMake and pkg-config files when not installing 3Avoid installation of LAPACK CMake and pkg-config files when not installing
4LAPACK, also allowing explicitly to switch off LAPACK build for BLAS-only 4LAPACK, also allowing explicitly to switch off LAPACK build for BLAS-only
5packaging. 5packaging.
6 6
7--- CMakeLists.txt.orig 2021-03-25 18:25:15.000000000 +0000 7--- CMakeLists.txt.orig 2021-03-25 18:25:15.000000000 +0000
8+++ CMakeLists.txt 8+++ CMakeLists.txt
9@@ -11,7 +11,7 @@ set( 
10 ) 
11  
12 # Add the CMake directory for custom CMake modules 
13-set(CMAKE_MODULE_PATH "${LAPACK_SOURCE_DIR}/CMAKE" ${CMAKE_MODULE_PATH}) 
14+set (CMAKE_MODULE_PATH "/data/pkgwork/math/lapack/work/.buildlink/cmake-Modules" "${LAPACK_SOURCE_DIR}/CMAKE" ${CMAKE_MODULE_PATH}) 
15  
16 # Export all symbols on Windows when building shared libraries 
17 SET(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) 
18@@ -160,6 +160,9 @@ endif() 9@@ -160,6 +160,9 @@ endif()
19  10
20  11
21 # -------------------------------------------------- 12 # --------------------------------------------------
22+ 13+
23+if(LAPACK) 14+if(LAPACK)
24+ 15+
25 set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets) 16 set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets)
26  17
27 macro(lapack_install_library lib) 18 macro(lapack_install_library lib)
28@@ -171,6 +174,18 @@ macro(lapack_install_library lib) 19@@ -171,6 +174,18 @@ macro(lapack_install_library lib)
29 ) 20 )
30 endmacro() 21 endmacro()