pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lapack, lapacke: fix lapacke build, remove lapacke-targets stuff



Module Name:	pkgsrc-wip
Committed By:	Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>
Pushed By:	thor
Date:		Sat May 23 00:39:57 2020 +0200
Changeset:	2fcf5929f77eacbd0e7bd5e533a4966a6d3b52a6

Modified Files:
	lapack/distinfo
	lapack/patches/patch-LAPACKE_CMakeLists.txt
	lapacke/PLIST

Log Message:
lapack, lapacke: fix lapacke build, remove lapacke-targets stuff

This suddenly was broken, cmake failure in configure phase. Dunno why.
I followed the example of cblas and removed the offending install()
line. It resulted in extra .cmake files that seem unnecessary anyway.

We need to upstream that build hackery to avoid having to mess with
forces we (I) do not understand (cmake).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2fcf5929f77eacbd0e7bd5e533a4966a6d3b52a6

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

diffstat:
 lapack/distinfo                             |  2 +-
 lapack/patches/patch-LAPACKE_CMakeLists.txt | 12 ++++++++++--
 lapacke/PLIST                               |  2 --
 3 files changed, 11 insertions(+), 5 deletions(-)

diffs:
diff --git a/lapack/distinfo b/lapack/distinfo
index 213b345b57..4999a771a1 100644
--- a/lapack/distinfo
+++ b/lapack/distinfo
@@ -8,7 +8,7 @@ SHA1 (patch-BLAS_SRC_CMakeLists.txt) = c8c69e6e0c67337af999863c4f5c64618d1374d7
 SHA1 (patch-CBLAS_cblas.pc.in) = 3befb18c1b7f2f82c6da83ea10f913c817acf09f
 SHA1 (patch-CBLAS_src_CMakeLists.txt) = faa1ad6c322830cb62e0f5bdab33732c0372cce3
 SHA1 (patch-CMakeLists.txt) = 90de0b88da519ea75659cd962fd2d1d9a29f5c07
-SHA1 (patch-LAPACKE_CMakeLists.txt) = 745c662d7f9ca45905434bffafaec2566e1a5559
+SHA1 (patch-LAPACKE_CMakeLists.txt) = b5d4fb36550e1ae47e7e68ffec0e10afa3ac8864
 SHA1 (patch-LAPACKE_lapacke.pc.in) = 7f0d91aaceac7f9980650ec90dbda95cf09b768f
 SHA1 (patch-SRC_CMakeLists.txt) = 2908cdeb0d94f51ec16b02b8a6426dd6cde7e10f
 SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 84d4cde8fef49c6efc9f50a3219b0299375934d5
diff --git a/lapack/patches/patch-LAPACKE_CMakeLists.txt b/lapack/patches/patch-LAPACKE_CMakeLists.txt
index 0e2209acff..a98a402600 100644
--- a/lapack/patches/patch-LAPACKE_CMakeLists.txt
+++ b/lapack/patches/patch-LAPACKE_CMakeLists.txt
@@ -31,8 +31,16 @@ Support combined build of shared and static libraries.
  install(
    FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h
    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-@@ -130,3 +150,4 @@
-   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
+@@ -126,7 +146,8 @@
    COMPONENT Development
    )
+ 
+-install(EXPORT lapacke-targets
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
+-  COMPONENT Development
+-  )
++#install(EXPORT lapacke-targets
++#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
++#  COMPONENT Development
++#  )
 +
diff --git a/lapacke/PLIST b/lapacke/PLIST
index a27d917eaf..25b8a03295 100644
--- a/lapacke/PLIST
+++ b/lapacke/PLIST
@@ -6,8 +6,6 @@ include/lapacke_mangling.h
 include/lapacke_utils.h
 lib/cmake/lapacke-${PKGVERSION}/lapacke-config-version.cmake
 lib/cmake/lapacke-${PKGVERSION}/lapacke-config.cmake
-lib/cmake/lapacke-${PKGVERSION}/lapacke-targets-release.cmake
-lib/cmake/lapacke-${PKGVERSION}/lapacke-targets.cmake
 lib/liblapacke.a
 lib/liblapacke.so
 lib/liblapacke.so.3


Home | Main Index | Thread Index | Old Index