CVS commit: pkgsrc/math/lapack

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Apr 21 13:53:19 UTC 2021

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

Log Message:
cblas: Fix link to Fortran libraries by using Fortran compiler as linker

On NetBSD.
In PKGSRC_FORTRAM=gfortran case, libcblas has no RPATH=/usr/pkg/gccXX/lib
and libgfortran and libquadmath are not found.
In PKGSRC_FORTRAN=g95 case, libcblas has no
RPATH=/usr/pkg/lib/gcc-lib/x86_64--netbsd/4.1.2 and libf95 is not found.

Use Fortran compiler as linker instread of C compiler to fix link.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/math/lapack/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/math/lapack/patches/patch-CBLAS_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.23 pkgsrc/math/lapack/distinfo:1.24
--- pkgsrc/math/lapack/distinfo:1.23    Mon Oct 12 21:51:57 2020
+++ pkgsrc/math/lapack/distinfo Wed Apr 21 13:53:18 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2020/10/12 21:51:57 bacon Exp $
+$NetBSD: distinfo,v 1.24 2021/04/21 13:53:18 ryoon Exp $
 
 SHA1 (lapack-3.9.0.tar.gz) = 0451d180eed2b12b94aaae77e772d7573e87bec4
 RMD160 (lapack-3.9.0.tar.gz) = 333bf17b3e2503c26cdd2139566fdc788be1d0c3
@@ -6,7 +6,7 @@ SHA512 (lapack-3.9.0.tar.gz) = 424956ad9
 Size (lapack-3.9.0.tar.gz) = 7534567 bytes
 SHA1 (patch-BLAS_SRC_CMakeLists.txt) = c8c69e6e0c67337af999863c4f5c64618d1374d7
 SHA1 (patch-CBLAS_cblas.pc.in) = 3befb18c1b7f2f82c6da83ea10f913c817acf09f
-SHA1 (patch-CBLAS_src_CMakeLists.txt) = faa1ad6c322830cb62e0f5bdab33732c0372cce3
+SHA1 (patch-CBLAS_src_CMakeLists.txt) = ee309360ff4ad487be60156900c62c960d07daf3
 SHA1 (patch-CMakeLists.txt) = ea2bec54dd2c283a96862ef760826bf6e633613e
 SHA1 (patch-LAPACKE_CMakeLists.txt) = b5d4fb36550e1ae47e7e68ffec0e10afa3ac8864
 SHA1 (patch-LAPACKE_lapacke.pc.in) = 7f0d91aaceac7f9980650ec90dbda95cf09b768f

Index: pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt
diff -u pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt:1.1 pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt:1.2
--- pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt:1.1       Mon Oct 12 21:51:57 2020
+++ pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt   Wed Apr 21 13:53:19 2021
@@ -1,10 +1,18 @@
-$NetBSD: patch-CBLAS_src_CMakeLists.txt,v 1.1 2020/10/12 21:51:57 bacon Exp $
+$NetBSD: patch-CBLAS_src_CMakeLists.txt,v 1.2 2021/04/21 13:53:19 ryoon Exp $
 
 Support combined build of shared and static libraries.
 
---- CBLAS/src/CMakeLists.txt.orig      2017-11-13 04:15:54.000000000 +0000
+--- CBLAS/src/CMakeLists.txt.orig      2019-11-21 07:57:43.000000000 +0000
 +++ CBLAS/src/CMakeLists.txt
-@@ -126,3 +126,18 @@ target_include_directories(cblas PUBLIC
+@@ -116,7 +116,6 @@ list(REMOVE_DUPLICATES SOURCES)
+ add_library(cblas ${SOURCES})
+ set_target_properties(
+   cblas PROPERTIES
+-  LINKER_LANGUAGE C
+   VERSION ${LAPACK_VERSION}
+   SOVERSION ${LAPACK_MAJOR_VERSION}
+   )
+@@ -126,3 +125,17 @@ target_include_directories(cblas PUBLIC
  )
  target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
  lapack_install_library(cblas)
@@ -13,7 +21,6 @@ Support combined build of shared and sta
 +  add_library(cblas_static STATIC ${SOURCES})
 +  set_target_properties(
 +    cblas_static PROPERTIES
-+    LINKER_LANGUAGE C
 +    OUTPUT_NAME cblas
 +    )
 +  target_include_directories(cblas_static PUBLIC