CVS commit: pkgsrc/math/lapack

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Sun Mar 13 07:31:57 UTC 2022

Modified Files:
        pkgsrc/math/lapack: distinfo
        pkgsrc/math/lapack/patches: patch-SRC_CMakeLists.txt

Log Message:
Fix lapack parallel build when building both static and shared libs

lapack creates .mod files that are created in the same location
when the static and shared libraries these then interfere with each
other. put the .mod files created when buildling the static library
in a different directory to fix this.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/math/lapack/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt

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

Modified files:

Index: pkgsrc/math/lapack/distinfo
diff -u pkgsrc/math/lapack/distinfo:1.31 pkgsrc/math/lapack/distinfo:1.32
--- pkgsrc/math/lapack/distinfo:1.31    Tue Nov 23 22:45:01 2021
+++ pkgsrc/math/lapack/distinfo Sun Mar 13 07:31:56 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2021/11/23 22:45:01 wiz Exp $
+$NetBSD: distinfo,v 1.32 2022/03/13 07:31:56 nros Exp $
 
 BLAKE2s (lapack-3.10.0.tar.gz) = 57d4953533000589bcf9a478d827dbd5fd0dca18094d30e02b9bd67a21197f00
 SHA512 (lapack-3.10.0.tar.gz) = 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf
@@ -10,5 +10,5 @@ SHA1 (patch-CBLAS_src_CMakeLists.txt) = 
 SHA1 (patch-CMakeLists.txt) = de1d623f2571752a8ac70fa9d65734ba39770fc5
 SHA1 (patch-LAPACKE_CMakeLists.txt) = 13e4662585088aa53f61f7079d103fdfcf985c4e
 SHA1 (patch-LAPACKE_lapacke.pc.in) = 6bbd72205120501cd60daf0b22b00ef7979fb329
-SHA1 (patch-SRC_CMakeLists.txt) = c0e22574e0c7ff6535c95a6f1f85903bbc1751b0
+SHA1 (patch-SRC_CMakeLists.txt) = 03bbccbd87334941650cab584469954153f610ed
 SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 07946678945dba3a7752849791f12e0666345983

Index: pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt
diff -u pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt:1.3 pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt:1.4
--- pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt:1.3     Tue Jun  1 22:13:35 2021
+++ pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt Sun Mar 13 07:31:56 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-SRC_CMakeLists.txt,v 1.3 2021/06/01 22:13:35 thor Exp $
+$NetBSD: patch-SRC_CMakeLists.txt,v 1.4 2022/03/13 07:31:56 nros Exp $
 
 Support combined build of shared and static libraries.
 
---- SRC/CMakeLists.txt.orig    2021-03-25 18:25:15.000000000 +0000
+--- SRC/CMakeLists.txt.orig    2021-06-28 16:39:12.000000000 +0000
 +++ SRC/CMakeLists.txt
-@@ -518,3 +518,23 @@ if(_is_coverage_build)
+@@ -524,3 +524,24 @@ if(_is_coverage_build)
  endif()
  
  lapack_install_library(${LAPACKLIB})
@@ -13,6 +13,7 @@ Support combined build of shared and sta
 +  set_target_properties(
 +    ${LAPACKLIB}_static PROPERTIES
 +    OUTPUT_NAME ${LAPACKLIB}
++    Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}_static_modules
 +    )
 +
 +  if(USE_XBLAS)