CVS commit: pkgsrc/math/lapack

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 14 11:41:00 UTC 2025

Modified Files:
        pkgsrc/math/lapack: Makefile Makefile.common PLIST distinfo
Added Files:
        pkgsrc/math/lapack/patches: patch-BLAS_CMakeLists.txt
            patch-CMakeLists.txt
Removed Files:
        pkgsrc/math/lapack/patches: patch-buildsystem-upstreamed

Log Message:
lapack: standardize patches to make updates easier

Clean some pkglint while here.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/math/lapack/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/math/lapack/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/lapack/PLIST
cvs rdiff -u -r1.36 -r1.37 pkgsrc/math/lapack/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/math/lapack/patches/patch-BLAS_CMakeLists.txt
cvs rdiff -u -r0 -r1.7 pkgsrc/math/lapack/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/math/lapack/patches/patch-buildsystem-upstreamed

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/Makefile
diff -u pkgsrc/math/lapack/Makefile:1.47 pkgsrc/math/lapack/Makefile:1.48
--- pkgsrc/math/lapack/Makefile:1.47    Sun Aug 25 06:19:00 2024
+++ pkgsrc/math/lapack/Makefile Tue Jan 14 11:40:59 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2024/08/25 06:19:00 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2025/01/14 11:40:59 wiz Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
 COMMENT=       Linear Algebra PACKage (Netlib reference implementation)
@@ -15,6 +15,6 @@ LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS= \
 # mk/blas.buildlink3.mk instead.
 .include "../../math/blas/buildlink3.mk"
 # Always require the same current version of all netlib packages.
-BUILDLINK_API_DEPENDS.blas +=  blas>=${PKGVERSION_NOREV}
+BUILDLINK_API_DEPENDS.blas+=   blas>=${PKGVERSION_NOREV}
 .include "../../math/lapack/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/lapack/Makefile.common
diff -u pkgsrc/math/lapack/Makefile.common:1.20 pkgsrc/math/lapack/Makefile.common:1.21
--- pkgsrc/math/lapack/Makefile.common:1.20     Sun Aug 25 06:19:00 2024
+++ pkgsrc/math/lapack/Makefile.common  Tue Jan 14 11:41:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2024/08/25 06:19:00 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2025/01/14 11:41:00 wiz Exp $
 # used by math/blas/Makefile
 # used by math/cblas/Makefile
 # used by math/lapacke/Makefile
@@ -46,9 +46,9 @@ HEADERDIR=            netlib
 # Note: We patch the build to install both static and
 # shared libraries.
 CMAKE_CONFIGURE_ARGS=  -DBUILD_DEPRECATED=ON \
-               -DBUILD_SHARED_LIBS=ON \
-               -DCMAKE_INSTALL_INCLUDEDIR=${PREFIX}/include/${HEADERDIR} \
-               ${LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS}
+                       -DBUILD_SHARED_LIBS=ON \
+                       -DCMAKE_INSTALL_INCLUDEDIR=${PREFIX}/include/${HEADERDIR} \
+                       ${LAPACK_COMPONENT_CMAKE_CONFIGURE_ARGS}
 
 # The cmake files are not ready for prime time.
 post-install:

Index: pkgsrc/math/lapack/PLIST
diff -u pkgsrc/math/lapack/PLIST:1.7 pkgsrc/math/lapack/PLIST:1.8
--- pkgsrc/math/lapack/PLIST:1.7        Mon Jan  8 21:28:55 2024
+++ pkgsrc/math/lapack/PLIST    Tue Jan 14 11:41:00 2025
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2024/01/08 21:28:55 thor Exp $
+@comment $NetBSD: PLIST,v 1.8 2025/01/14 11:41:00 wiz Exp $
 lib/liblapack.so
 lib/liblapack.so.3
-lib/liblapack.so.${PKGVERSION}
+lib/liblapack.so.3.12.0
 lib/pkgconfig/lapack.pc

Index: pkgsrc/math/lapack/distinfo
diff -u pkgsrc/math/lapack/distinfo:1.36 pkgsrc/math/lapack/distinfo:1.37
--- pkgsrc/math/lapack/distinfo:1.36    Tue Jan  9 03:32:48 2024
+++ pkgsrc/math/lapack/distinfo Tue Jan 14 11:41:00 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.36 2024/01/09 03:32:48 ryoon Exp $
+$NetBSD: distinfo,v 1.37 2025/01/14 11:41:00 wiz Exp $
 
 BLAKE2s (lapack-3.12.0.tar.gz) = 825f0d9aa80ae124635784ef7801bf0e2232c27f4f1fec246fb978366ca41bf9
 SHA512 (lapack-3.12.0.tar.gz) = f8f3c733a0221be0b3f5618235408ac59cbd4e5f1c4eab5f509b831a6ec6a9ef14b8849aa6ea10810df1aff90186ca454d15e9438d1dd271c2449d42d3da9dda
 Size (lapack-3.12.0.tar.gz) = 7933607 bytes
+SHA1 (patch-BLAS_CMakeLists.txt) = fe453f02836357dc265126c2eb4db5d79c370a8a
 SHA1 (patch-CBLAS_src_CMakeLists.txt) = d400dc4ec02620f8c4fc99331b7e4d69362c810e
-SHA1 (patch-buildsystem-upstreamed) = c1e59582c1344a3cb74cc682d9e8b7c10a4ebe61
+SHA1 (patch-CMakeLists.txt) = 9f82695bd3d74f18c2ad0b928661947cfc5d35c5

Added files:

Index: pkgsrc/math/lapack/patches/patch-BLAS_CMakeLists.txt
diff -u /dev/null pkgsrc/math/lapack/patches/patch-BLAS_CMakeLists.txt:1.1
--- /dev/null   Tue Jan 14 11:41:00 2025
+++ pkgsrc/math/lapack/patches/patch-BLAS_CMakeLists.txt        Tue Jan 14 11:41:00 2025
@@ -0,0 +1,21 @@
+$NetBSD: patch-BLAS_CMakeLists.txt,v 1.1 2025/01/14 11:41:00 wiz Exp $
+
+A changeset that I pushed upstream in a PR, to enable separate libblas build,
+un-break standalone CBLAS build with included BLAS, not unconditionally
+require unnecessary C++ compiler.
+
+See: https://github.com/Reference-LAPACK/lapack/pull/972
+
+diff --git a/BLAS/CMakeLists.txt b/BLAS/CMakeLists.txt
+index a33f38f25..8e34fa858 100644
+--- BLAS/CMakeLists.txt.orig   2024-12-03 11:39:11.000000000 +0000
++++ BLAS/CMakeLists.txt
+@@ -14,3 +14,8 @@ install(FILES
+   DESTINATION ${PKG_CONFIG_DIR}
+   COMPONENT Development
+   )
++
++install(EXPORT ${BLASLIB}-targets
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${BLASLIB}-${LAPACK_VERSION}
++  COMPONENT Development
++  )

Index: pkgsrc/math/lapack/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/math/lapack/patches/patch-CMakeLists.txt:1.7
--- /dev/null   Tue Jan 14 11:41:00 2025
+++ pkgsrc/math/lapack/patches/patch-CMakeLists.txt     Tue Jan 14 11:41:00 2025
@@ -0,0 +1,125 @@
+$NetBSD: patch-CMakeLists.txt,v 1.7 2025/01/14 11:41:00 wiz Exp $
+
+A changeset that I pushed upstream in a PR, to enable separate libblas build,
+un-break standalone CBLAS build with included BLAS, not unconditionally
+require unnecessary C++ compiler.
+
+See: https://github.com/Reference-LAPACK/lapack/pull/972
+
+--- CMakeLists.txt.orig        2023-11-24 20:41:15.000000000 +0000
++++ CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 3.6)
+ 
+-project(LAPACK)
++project(LAPACK Fortran C)
+ 
+ set(LAPACK_MAJOR_VERSION 3)
+ set(LAPACK_MINOR_VERSION 12)
+@@ -244,8 +244,12 @@ endif()
+ # Neither user specified or optimized BLAS libraries can be used
+ if(NOT BLAS_FOUND)
+   message(STATUS "Using supplied NETLIB BLAS implementation")
++  set(LAPACK_INSTALL_EXPORT_NAME_CACHE ${LAPACK_INSTALL_EXPORT_NAME})
++  set(LAPACK_INSTALL_EXPORT_NAME ${BLASLIB}-targets)
+   add_subdirectory(BLAS)
+   set(BLAS_LIBRARIES ${BLASLIB})
++  set(LAPACK_INSTALL_EXPORT_NAME ${LAPACK_INSTALL_EXPORT_NAME_CACHE})
++  unset(LAPACK_INSTALL_EXPORT_NAME_CACHE)
+ else()
+   set(CMAKE_EXE_LINKER_FLAGS
+     "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
+@@ -277,6 +281,10 @@ endif()
+ 
+ option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
+ 
++option(LAPACK "Whether to build or use LAPACK (to enable a BLAS-only build)")
++
++if(LAPACK)
++
+ # --------------------------------------------------
+ # LAPACK
+ # User did not provide a LAPACK Library but specified to search for one
+@@ -348,6 +356,8 @@ else()
+     CACHE STRING "Linker flags for shared libs" FORCE)
+ endif()
+ 
++endif()
++
+ if(BUILD_TESTING)
+   add_subdirectory(TESTING)
+ endif()
+@@ -413,6 +423,7 @@ function(_display_cpp_implementation_msg
+   message(STATUS "----------------")
+ endfunction()
+ if (BLAS++)
++  enable_language(CXX)
+   _display_cpp_implementation_msg("BLAS")
+   include(ExternalProject)
+   ExternalProject_Add(blaspp
+@@ -424,6 +435,7 @@ if (BLAS++)
+   ExternalProject_Add_StepDependencies(blaspp build ${BLAS_LIBRARIES})
+ endif()
+ if (LAPACK++)
++  enable_language(CXX)
+       message (STATUS "linking lapack++ against ${LAPACK_LIBRARIES}")
+   _display_cpp_implementation_msg("LAPACK")
+   include(ExternalProject)
+@@ -482,10 +494,14 @@ if(NOT BLAS_FOUND)
+   set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
+ endif()
+ 
++if(LAPACK)
+ if(NOT LATESTLAPACK_FOUND)
+   set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB})
++  set(BUILD_LAPACK ON)
++endif()
+ endif()
+ 
++if(LAPACK)
+ # Export lapack targets, not including lapacke, from the
+ # install tree, if any.
+ set(_lapack_config_install_guard_target "")
+@@ -499,6 +515,7 @@ if(ALL_TARGETS)
+   # lapack-config.cmake to load targets from the install tree.
+   list(GET ALL_TARGETS 0 _lapack_config_install_guard_target)
+ endif()
++endif()
+ 
+ # Include cblas in targets exported from the build tree.
+ if(CBLAS)
+@@ -514,6 +531,8 @@ if(NOT LAPACK_WITH_TMGLIB_FOUND AND LAPA
+   set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB})
+ endif()
+ 
++if(BUILD_LAPACK)
++
+ # Export lapack and lapacke targets from the build tree, if any.
+ set(_lapack_config_build_guard_target "")
+ if(ALL_TARGETS)
+@@ -551,6 +570,9 @@ install(FILES
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
+   COMPONENT Development
+   )
++
++endif() # BUILD_LAPACK
++
+ if (LAPACK++)
+   install(
+   DIRECTORY "${LAPACK_BINARY_DIR}/lib/"
+@@ -562,6 +584,7 @@ if (LAPACK++)
+     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+     FILES_MATCHING REGEX "\\.(h|hh)$"
+   )
++  include(CMakePackageConfigHelpers)
+   write_basic_package_version_file(
+     "lapackppConfigVersion.cmake"
+     VERSION 2020.10.02
+@@ -575,6 +598,7 @@ if (LAPACK++)
+ 
+ endif()
+ if (BLAS++)
++  include(CMakePackageConfigHelpers)
+   write_basic_package_version_file(
+     "blasppConfigVersion.cmake"
+     VERSION 2020.10.02