1 |
commit: 79bed38716ab835d356b87c2bcec3e2180685481 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Fri Aug 27 07:19:03 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 27 23:31:00 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79bed387 |
7 |
|
8 |
dev-util/cmake: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/22122 |
11 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch | 43 ------- |
16 |
.../cmake/files/cmake-3.11.0_rc2-FindBLAS.patch | 23 ---- |
17 |
.../files/cmake-3.11.4-fix-boost-detection.patch | 13 --- |
18 |
.../cmake/files/cmake-3.13.4-prefix-dirs.patch | 127 --------------------- |
19 |
.../files/cmake-3.4.0_rc1-darwin-bundle.patch | 25 ---- |
20 |
5 files changed, 231 deletions(-) |
21 |
|
22 |
diff --git a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch |
23 |
deleted file mode 100644 |
24 |
index 321f05302aa..00000000000 |
25 |
--- a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch |
26 |
+++ /dev/null |
27 |
@@ -1,43 +0,0 @@ |
28 |
---- a/Modules/FindLAPACK.cmake |
29 |
-+++ b/Modules/FindLAPACK.cmake |
30 |
-@@ -4,6 +4,10 @@ |
31 |
- # |
32 |
- # Find LAPACK library |
33 |
- # |
34 |
-+# Version modified for Gentoo Linux. |
35 |
-+# If a valid PkgConfig configuration is found, this overrides and cancels |
36 |
-+# all further checks. |
37 |
-+# |
38 |
- # This module finds an installed fortran library that implements the |
39 |
- # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/). |
40 |
- # |
41 |
-@@ -140,6 +144,23 @@ |
42 |
- |
43 |
- endmacro() |
44 |
- |
45 |
-+# |
46 |
-+# first, try PkgConfig |
47 |
-+# |
48 |
-+find_package(PkgConfig REQUIRED) |
49 |
-+pkg_check_modules(PC_LAPACK lapack) |
50 |
-+if(PC_LAPACK_FOUND) |
51 |
-+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) |
52 |
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) |
53 |
-+ if (NOT ${PC_LIB}_LIBRARY) |
54 |
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") |
55 |
-+ endif (NOT ${PC_LIB}_LIBRARY) |
56 |
-+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) |
57 |
-+ endforeach(PC_LIB) |
58 |
-+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) |
59 |
-+ mark_as_advanced(LAPACK_LIBRARIES) |
60 |
-+else(PC_LAPACK_FOUND) |
61 |
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") |
62 |
- |
63 |
- set(LAPACK_LINKER_FLAGS) |
64 |
- set(LAPACK_LIBRARIES) |
65 |
-@@ -348,3 +369,5 @@ |
66 |
- endif() |
67 |
- |
68 |
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |
69 |
-+ |
70 |
-+endif(PC_LAPACK_FOUND) |
71 |
|
72 |
diff --git a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch |
73 |
deleted file mode 100644 |
74 |
index 6bad45b2087..00000000000 |
75 |
--- a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch |
76 |
+++ /dev/null |
77 |
@@ -1,23 +0,0 @@ |
78 |
---- a/Modules/FindBLAS.cmake |
79 |
-+++ b/Modules/FindBLAS.cmake |
80 |
-@@ -4,6 +4,10 @@ |
81 |
- # |
82 |
- # Find BLAS library |
83 |
- # |
84 |
-+# Version modified for Gentoo Linux. |
85 |
-+# If a valid PkgConfig configuration is found, this overrides and cancels |
86 |
-+# all further checks. |
87 |
-+# |
88 |
- # This module finds an installed fortran library that implements the |
89 |
- # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The |
90 |
- # list of libraries searched for is taken from the autoconf macro file, |
91 |
-@@ -50,6 +54,9 @@ |
92 |
- # (To distribute this file outside of CMake, substitute the full |
93 |
- # License text for the above reference.) |
94 |
- |
95 |
-+# first, try PkgConfig |
96 |
-+set(BLA_PREFER_PKGCONFIG On) |
97 |
-+ |
98 |
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) |
99 |
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) |
100 |
- |
101 |
|
102 |
diff --git a/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch b/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch |
103 |
deleted file mode 100644 |
104 |
index bcf229ad398..00000000000 |
105 |
--- a/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch |
106 |
+++ /dev/null |
107 |
@@ -1,13 +0,0 @@ |
108 |
-https://bugs.gentoo.org/660980 |
109 |
- |
110 |
---- cmake-3.11.4/Modules/FindBoost.cmake |
111 |
-+++ cmake-3.11.4/Modules/FindBoost.cmake |
112 |
-@@ -1680,7 +1680,7 @@ |
113 |
- list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}") |
114 |
- list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}") |
115 |
- # Gentoo |
116 |
-- list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}") |
117 |
-+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}.${COMPONENT_PYTHON_VERSION_MINOR}") |
118 |
- # RPMs |
119 |
- list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}") |
120 |
- endif() |
121 |
|
122 |
diff --git a/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch |
123 |
deleted file mode 100644 |
124 |
index bb60aaf3519..00000000000 |
125 |
--- a/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch |
126 |
+++ /dev/null |
127 |
@@ -1,127 +0,0 @@ |
128 |
-From b1f045122fb210728081ae2165197aebff4ee498 Mon Sep 17 00:00:00 2001 |
129 |
-From: Lars Wendler <polynomial-c@g.o> |
130 |
-Date: Fri, 9 Jun 2017 01:47:55 +0200 |
131 |
-Subject: [PATCH] Set some proper paths to make cmake find our tools. |
132 |
- |
133 |
-The ebuild now adds an extra / at the end of $EPREFIX so that it is |
134 |
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains |
135 |
-correct) |
136 |
- |
137 |
-Original patch by Heiko Przybyl. |
138 |
-Updated by Chris Reffett (cmake-2.8.8) |
139 |
-Updated by Johannes Huber (cmake-2.8.9) |
140 |
-Updated by Michael Palimaka (cmake-2.8.10) |
141 |
-Updated by Chris Reffett (cmake-2.8.11) |
142 |
-Updated by Michael Palimaka (cmake-3.0.0) |
143 |
-Updated by Lars Wendler (cmake-3.9.0_rc2) |
144 |
---- |
145 |
- Modules/Platform/Darwin.cmake | 12 ++++++++---- |
146 |
- Modules/Platform/UnixPaths.cmake | 29 ++++++++++++++++++++++++----- |
147 |
- 2 files changed, 32 insertions(+), 9 deletions(-) |
148 |
- |
149 |
-Index: cmake-3.13.3/Modules/Platform/Darwin.cmake |
150 |
-=================================================================== |
151 |
---- cmake-3.13.3.orig/Modules/Platform/Darwin.cmake |
152 |
-+++ cmake-3.13.3/Modules/Platform/Darwin.cmake |
153 |
-@@ -108,9 +108,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F) |
154 |
- set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F) |
155 |
- set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F) |
156 |
- |
157 |
--# default to searching for frameworks first |
158 |
-+# default to searching for frameworks last |
159 |
- if(NOT DEFINED CMAKE_FIND_FRAMEWORK) |
160 |
-- set(CMAKE_FIND_FRAMEWORK FIRST) |
161 |
-+ set(CMAKE_FIND_FRAMEWORK LAST) |
162 |
- endif() |
163 |
- |
164 |
- # Older OS X linkers do not report their framework search path |
165 |
-@@ -132,6 +132,8 @@ endif() |
166 |
- |
167 |
- # set up the default search directories for frameworks |
168 |
- set(CMAKE_SYSTEM_FRAMEWORK_PATH |
169 |
-+ @GENTOO_PORTAGE_EPREFIX@Frameworks |
170 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib |
171 |
- ~/Library/Frameworks |
172 |
- ) |
173 |
- if(_CMAKE_OSX_SYSROOT_PATH) |
174 |
-@@ -178,13 +180,15 @@ if(CMAKE_OSX_SYSROOT) |
175 |
- endif() |
176 |
- endif() |
177 |
- |
178 |
--# default to searching for application bundles first |
179 |
-+# default to searching for application bundles last |
180 |
- if(NOT DEFINED CMAKE_FIND_APPBUNDLE) |
181 |
-- set(CMAKE_FIND_APPBUNDLE FIRST) |
182 |
-+ set(CMAKE_FIND_APPBUNDLE LAST) |
183 |
- endif() |
184 |
- # set up the default search directories for application bundles |
185 |
- set(_apps_paths) |
186 |
- foreach(_path |
187 |
-+ @GENTOO_PORTAGE_EPREFIX@Applications |
188 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin |
189 |
- "~/Applications" |
190 |
- "/Applications" |
191 |
- "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ |
192 |
-Index: cmake-3.13.3/Modules/Platform/UnixPaths.cmake |
193 |
-=================================================================== |
194 |
---- cmake-3.13.3.orig/Modules/Platform/UnixPaths.cmake |
195 |
-+++ cmake-3.13.3/Modules/Platform/UnixPaths.cmake |
196 |
-@@ -23,7 +23,8 @@ get_filename_component(_CMAKE_INSTALL_DI |
197 |
- # search types. |
198 |
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH |
199 |
- # Standard |
200 |
-- /usr/local /usr / |
201 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ |
202 |
-+ @GENTOO_HOST@/usr/local /usr / |
203 |
- |
204 |
- # CMake install location |
205 |
- "${_CMAKE_INSTALL_DIR}" |
206 |
-@@ -50,23 +51,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH |
207 |
- |
208 |
- # List common include file locations not under the common prefixes. |
209 |
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH |
210 |
-- # X11 |
211 |
-- /usr/include/X11 |
212 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/include |
213 |
- ) |
214 |
- |
215 |
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH |
216 |
-- # X11 |
217 |
-- /usr/lib/X11 |
218 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
219 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@ |
220 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
221 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 |
222 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
223 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib |
224 |
-+ @GENTOO_PORTAGE_EPREFIX@lib |
225 |
-+ ) |
226 |
-+ |
227 |
-+list(APPEND CMAKE_SYSTEM_PROGRAM_PATH |
228 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin |
229 |
-+ @GENTOO_PORTAGE_EPREFIX@bin |
230 |
- ) |
231 |
- |
232 |
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES |
233 |
-- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 |
234 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
235 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@ |
236 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
237 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 |
238 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
239 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib |
240 |
-+ @GENTOO_PORTAGE_EPREFIX@lib |
241 |
-+ @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 |
242 |
- ) |
243 |
- |
244 |
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES |
245 |
-- /usr/include |
246 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/include |
247 |
-+ @GENTOO_HOST@/usr/include |
248 |
- ) |
249 |
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES |
250 |
-- /usr/include |
251 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/include |
252 |
-+ @GENTOO_HOST@/usr/include |
253 |
- ) |
254 |
- list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES |
255 |
|
256 |
diff --git a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch |
257 |
deleted file mode 100644 |
258 |
index 2808ed79f73..00000000000 |
259 |
--- a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch |
260 |
+++ /dev/null |
261 |
@@ -1,25 +0,0 @@ |
262 |
-Don't use .so for modules on darwin/macos. Use .bundle instead. |
263 |
-Patch by Heiko Przybyl |
264 |
- |
265 |
-Forward-ported from 2.8.10 to 3.4.0-rc1 |
266 |
- |
267 |
---- cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake |
268 |
-+++ cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake |
269 |
-@@ -26,7 +26,7 @@ |
270 |
- set(CMAKE_SHARED_LIBRARY_PREFIX "lib") |
271 |
- set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") |
272 |
- set(CMAKE_SHARED_MODULE_PREFIX "lib") |
273 |
--set(CMAKE_SHARED_MODULE_SUFFIX ".so") |
274 |
-+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle") |
275 |
- set(CMAKE_MODULE_EXISTS 1) |
276 |
- set(CMAKE_DL_LIBS "") |
277 |
- |
278 |
-@@ -53,7 +53,7 @@ |
279 |
- set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") |
280 |
- set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") |
281 |
- set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") |
282 |
--set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a") |
283 |
-+set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a") |
284 |
- |
285 |
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree |
286 |
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache |