diff options
author | 2020-12-17 11:14:37 +0100 | |
---|---|---|
committer | 2020-12-17 11:23:25 +0100 | |
commit | 6b3170b4b49c98c4fd39edf942b2a9710278abd4 (patch) | |
tree | e8a484484d53f401309c9a62392f7be2a644b940 /dev-util/cmake/files | |
parent | media-gfx/krita: Drop 4.3.0 (diff) | |
download | gentoo-6b3170b4b49c98c4fd39edf942b2a9710278abd4.tar.gz gentoo-6b3170b4b49c98c4fd39edf942b2a9710278abd4.tar.bz2 gentoo-6b3170b4b49c98c4fd39edf942b2a9710278abd4.zip |
dev-util/cmake: Drop 3.16.5
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-util/cmake/files')
-rw-r--r-- | dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch | 55 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch | 37 |
2 files changed, 0 insertions, 92 deletions
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch deleted file mode 100644 index ebd83f38d187..000000000000 --- a/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6d4d97b328f48862923bb55c1c0976b1d532dcc3 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Sun, 10 Feb 2019 23:01:53 +0100 -Subject: [PATCH] Prefer pkgconfig in FindLAPACK - ---- - Modules/FindLAPACK.cmake | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake -index d6646eaacf..ef5f324670 100644 ---- a/Modules/FindLAPACK.cmake -+++ b/Modules/FindLAPACK.cmake -@@ -7,6 +7,10 @@ FindLAPACK - - Find LAPACK library - -+Version modified for Gentoo Linux. -+If a valid PkgConfig configuration is found, this overrides and cancels -+all further checks. -+ - This module finds an installed fortran library that implements the - LAPACK linear-algebra interface (see http://www.netlib.org/lapack/). - -@@ -181,6 +185,21 @@ endif() - - endmacro() - -+# first, try PkgConfig -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(PC_LAPACK lapack) -+if(PC_LAPACK_FOUND) -+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) -+ if (NOT ${PC_LIB}_LIBRARY) -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") -+ endif (NOT ${PC_LIB}_LIBRARY) -+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) -+ endforeach(PC_LIB) -+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) -+ mark_as_advanced(LAPACK_LIBRARIES) -+else(PC_LAPACK_FOUND) -+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") - - set(LAPACK_LINKER_FLAGS) - set(LAPACK_LIBRARIES) -@@ -428,3 +447,5 @@ endif() - - cmake_pop_check_state() - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(PC_LAPACK_FOUND) --- -2.20.1 - diff --git a/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch deleted file mode 100644 index 64ab5612b868..000000000000 --- a/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4de8287ce3b098ea579a28155d442eb589db8617 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Sat, 22 Jun 2019 16:09:05 +0200 -Subject: [PATCH] Prefer pkgconfig in FindBLAS - ---- - Modules/FindBLAS.cmake | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake -index 77f9d0e40c..bbe155caa9 100644 ---- a/Modules/FindBLAS.cmake -+++ b/Modules/FindBLAS.cmake -@@ -7,6 +7,10 @@ FindBLAS - - Find Basic Linear Algebra Subprograms (BLAS) library - -+Version modified for Gentoo Linux. -+If a valid PkgConfig configuration is found, this overrides and cancels -+all further checks. -+ - This module finds an installed Fortran library that implements the - BLAS linear-algebra interface (see http://www.netlib.org/blas/). The - list of libraries searched for is taken from the ``autoconf`` macro file, -@@ -92,6 +96,9 @@ installation. - - #]=======================================================================] - -+# first, try PkgConfig -+set(BLA_PREFER_PKGCONFIG On) -+ - include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) - include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) - include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake) --- -2.22.0 - |