1 |
commit: cdd81e40ec220a0a7796a214e8758989cf99dd2b |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 14 19:36:13 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 14 19:37:31 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd81e40 |
7 |
|
8 |
dev-util/cmake: Removed old |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
dev-util/cmake/Manifest | 1 - |
13 |
dev-util/cmake/cmake-3.21.2.ebuild | 232 --------------------- |
14 |
.../cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch | 56 ----- |
15 |
3 files changed, 289 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest |
18 |
index 78feaf4a5b2..bee7fa09772 100644 |
19 |
--- a/dev-util/cmake/Manifest |
20 |
+++ b/dev-util/cmake/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008 |
23 |
-DIST cmake-3.21.2.tar.gz 9630492 BLAKE2B 7c73cad02ee9dbadd8cbf60994856ccb6fd3721cbb7a58d66638169cf99426d8ad732de912ee5c736466d64c145a68a102db93cb5d4d0dbde001681edbf7a200 SHA512 75649404564aaa6175a8c66ab19a10318066dbb667806c287e3cb125ac4c16c1629c160e355bcc50864a38d5488b1f7d1bc77acc602f5f3edd5f68691ae5080d |
24 |
DIST cmake-3.21.3.tar.gz 9630442 BLAKE2B dccf4878745f6ddb87ea5fd1a0b6c728e32778afd15e3074d057234dc898e399133343bb10826f8882323bfc9d53f22c98b51ab6e39af29da58c54ed0b9d14c1 SHA512 0571b78443906c5ad51fb0fafbd32d565caf628cc150b1190802cb819e8497c108ea6b7ecaa03133df2dbbceb730696d24b4df38468c92088c769ce4076d9e9f |
25 |
DIST cmake-3.22.0-rc1.tar.gz 9769355 BLAKE2B 03398d2aca8c7f354d1b0d4f6447780cf8699ab388f342dea9266f0d2ecb0eeb38d5e51df9f6a9509d62db8b78b8774c76c82976cf1d263b1c572a00e96e698f SHA512 ed2a7c0832fd6fef5909745b6d540d1eee4b7f6681dca6e2b5cd22ea1a2be795fc1cb3b25792719211d7fe94871aa12253f4ce088985652496b3fdcbf0000e20 |
26 |
|
27 |
diff --git a/dev-util/cmake/cmake-3.21.2.ebuild b/dev-util/cmake/cmake-3.21.2.ebuild |
28 |
deleted file mode 100644 |
29 |
index b1cc1455ac6..00000000000 |
30 |
--- a/dev-util/cmake/cmake-3.21.2.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,232 +0,0 @@ |
33 |
-# Copyright 1999-2021 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja |
39 |
-CMAKE_REMOVE_MODULES_LIST=( none ) |
40 |
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ |
41 |
- toolchain-funcs virtualx xdg-utils |
42 |
- |
43 |
-MY_P="${P/_/-}" |
44 |
- |
45 |
-DESCRIPTION="Cross platform Make" |
46 |
-HOMEPAGE="https://cmake.org/" |
47 |
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" |
48 |
- |
49 |
-LICENSE="CMake" |
50 |
-SLOT="0" |
51 |
-[[ "${PV}" = *_rc* ]] || \ |
52 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
53 |
-IUSE="doc emacs ncurses qt5 test" |
54 |
-RESTRICT="!test? ( test )" |
55 |
- |
56 |
-RDEPEND=" |
57 |
- >=app-arch/libarchive-3.3.3:= |
58 |
- app-crypt/rhash |
59 |
- >=dev-libs/expat-2.0.1 |
60 |
- >=dev-libs/jsoncpp-1.9.2-r2:0= |
61 |
- >=dev-libs/libuv-1.10.0:= |
62 |
- >=net-misc/curl-7.21.5[ssl] |
63 |
- sys-libs/zlib |
64 |
- virtual/pkgconfig |
65 |
- emacs? ( >=app-editors/emacs-23.1:* ) |
66 |
- ncurses? ( sys-libs/ncurses:0= ) |
67 |
- qt5? ( |
68 |
- dev-qt/qtcore:5 |
69 |
- dev-qt/qtgui:5 |
70 |
- dev-qt/qtwidgets:5 |
71 |
- ) |
72 |
-" |
73 |
-DEPEND="${RDEPEND}" |
74 |
-BDEPEND=" |
75 |
- doc? ( |
76 |
- dev-python/requests |
77 |
- dev-python/sphinx |
78 |
- ) |
79 |
- test? ( app-arch/libarchive[zstd] ) |
80 |
-" |
81 |
- |
82 |
-S="${WORKDIR}/${MY_P}" |
83 |
- |
84 |
-SITEFILE="50${PN}-gentoo.el" |
85 |
- |
86 |
-PATCHES=( |
87 |
- # prefix |
88 |
- "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch |
89 |
- "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch |
90 |
- "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch |
91 |
- |
92 |
- # handle gentoo packaging in find modules |
93 |
- "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch |
94 |
- # Next patch needs to be reworked |
95 |
- #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch |
96 |
- "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch |
97 |
- |
98 |
- # respect python eclasses |
99 |
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
100 |
- "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch |
101 |
- |
102 |
- "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 |
103 |
- |
104 |
- # upstream fixes (can usually be removed with a version bump) |
105 |
-) |
106 |
- |
107 |
-cmake_src_bootstrap() { |
108 |
- # disable running of cmake in bootstrap command |
109 |
- sed -i \ |
110 |
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
111 |
- bootstrap || die "sed failed" |
112 |
- |
113 |
- # execinfo.h on Solaris isn't quite what it is on Darwin |
114 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
115 |
- sed -i -e 's/execinfo\.h/blablabla.h/' \ |
116 |
- Source/kwsys/CMakeLists.txt || die |
117 |
- fi |
118 |
- |
119 |
- # bootstrap script isn't exactly /bin/sh compatible |
120 |
- tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ |
121 |
- --prefix="${T}/cmakestrap/" \ |
122 |
- --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ |
123 |
- || die "Bootstrap failed" |
124 |
-} |
125 |
- |
126 |
-cmake_src_test() { |
127 |
- # fix OutDir and SelectLibraryConfigurations tests |
128 |
- # these are altered thanks to our eclass |
129 |
- sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ |
130 |
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
131 |
- || die |
132 |
- |
133 |
- pushd "${BUILD_DIR}" > /dev/null |
134 |
- |
135 |
- local ctestargs |
136 |
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
137 |
- |
138 |
- # Excluded tests: |
139 |
- # BootstrapTest: we actually bootstrap it every time so why test it. |
140 |
- # BundleUtilities: bundle creation broken |
141 |
- # CMakeOnly.AllFindModules: pthread issues |
142 |
- # CTest.updatecvs: fails to commit as root |
143 |
- # Fortran: requires fortran |
144 |
- # RunCMake.CompilerLauncher: also requires fortran |
145 |
- # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because |
146 |
- # debugedit binary is not in the expected location |
147 |
- # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because |
148 |
- # it can't find a deb package that owns libc |
149 |
- # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4 |
150 |
- # TestUpload: requires network access |
151 |
- "${BUILD_DIR}"/bin/ctest \ |
152 |
- -j "$(makeopts_jobs)" \ |
153 |
- --test-load "$(makeopts_loadavg)" \ |
154 |
- ${ctestargs} \ |
155 |
- -E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ |
156 |
- || die "Tests failed" |
157 |
- |
158 |
- popd > /dev/null |
159 |
-} |
160 |
- |
161 |
-src_prepare() { |
162 |
- cmake_src_prepare |
163 |
- |
164 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
165 |
- # disable Xcode hooks, bug #652134 |
166 |
- sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ |
167 |
- Source/CMakeLists.txt || die |
168 |
- sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ |
169 |
- -e '/cmGlobalXCodeGenerator.h/d' \ |
170 |
- Source/cmake.cxx || die |
171 |
- # disable isysroot usage with GCC, we've properly instructed |
172 |
- # where things are via GCC configuration and ldwrapper |
173 |
- sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ |
174 |
- Modules/Platform/Apple-GNU-*.cmake || die |
175 |
- # disable isysroot usage with clang as well |
176 |
- sed -i -e '/_SYSROOT_FLAG/d' \ |
177 |
- Modules/Platform/Apple-Clang.cmake || die |
178 |
- # don't set a POSIX standard, system headers don't like that, #757426 |
179 |
- sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ |
180 |
- Source/cmLoadCommandCommand.cxx \ |
181 |
- Source/cmStandardLexer.h \ |
182 |
- Source/cmSystemTools.cxx \ |
183 |
- Source/cmTimestamp.cxx |
184 |
- sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ |
185 |
- Source/cmStandardLexer.h |
186 |
- fi |
187 |
- |
188 |
- # Add gcc libs to the default link paths |
189 |
- sed -i \ |
190 |
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
191 |
- -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ |
192 |
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
193 |
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
194 |
- if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then |
195 |
- CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
196 |
- cmake_src_bootstrap |
197 |
- fi |
198 |
-} |
199 |
- |
200 |
-src_configure() { |
201 |
- # Fix linking on Solaris |
202 |
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl |
203 |
- |
204 |
- local mycmakeargs=( |
205 |
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
206 |
- -DCMAKE_DOC_DIR=/share/doc/${PF} |
207 |
- -DCMAKE_MAN_DIR=/share/man |
208 |
- -DCMAKE_DATA_DIR=/share/${PN} |
209 |
- -DSPHINX_MAN=$(usex doc) |
210 |
- -DSPHINX_HTML=$(usex doc) |
211 |
- -DBUILD_CursesDialog="$(usex ncurses)" |
212 |
- -DBUILD_TESTING=$(usex test) |
213 |
- ) |
214 |
- use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) |
215 |
- |
216 |
- cmake_src_configure |
217 |
-} |
218 |
- |
219 |
-src_compile() { |
220 |
- cmake_src_compile |
221 |
- use emacs && elisp-compile Auxiliary/cmake-mode.el |
222 |
-} |
223 |
- |
224 |
-src_test() { |
225 |
- virtx cmake_src_test |
226 |
-} |
227 |
- |
228 |
-src_install() { |
229 |
- cmake_src_install |
230 |
- |
231 |
- if use emacs; then |
232 |
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
233 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
234 |
- fi |
235 |
- |
236 |
- insinto /usr/share/vim/vimfiles/syntax |
237 |
- doins Auxiliary/vim/syntax/cmake.vim |
238 |
- |
239 |
- insinto /usr/share/vim/vimfiles/indent |
240 |
- doins Auxiliary/vim/indent/cmake.vim |
241 |
- |
242 |
- insinto /usr/share/vim/vimfiles/ftdetect |
243 |
- doins "${FILESDIR}/${PN}.vim" |
244 |
- |
245 |
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
246 |
-} |
247 |
- |
248 |
-pkg_postinst() { |
249 |
- use emacs && elisp-site-regen |
250 |
- if use qt5; then |
251 |
- xdg_icon_cache_update |
252 |
- xdg_desktop_database_update |
253 |
- xdg_mimeinfo_database_update |
254 |
- fi |
255 |
-} |
256 |
- |
257 |
-pkg_postrm() { |
258 |
- use emacs && elisp-site-regen |
259 |
- if use qt5; then |
260 |
- xdg_icon_cache_update |
261 |
- xdg_desktop_database_update |
262 |
- xdg_mimeinfo_database_update |
263 |
- fi |
264 |
-} |
265 |
|
266 |
diff --git a/dev-util/cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch |
267 |
deleted file mode 100644 |
268 |
index 29eefcbd515..00000000000 |
269 |
--- a/dev-util/cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch |
270 |
+++ /dev/null |
271 |
@@ -1,56 +0,0 @@ |
272 |
-From 7459f27dd4bb9b60067ac49ee2c6be93d20c2c1e Mon Sep 17 00:00:00 2001 |
273 |
-From: Lars Wendler <polynomial-c@g.o> |
274 |
-Date: Thu, 13 Feb 2020 13:16:16 +0100 |
275 |
-Subject: [PATCH] Prefer pkgconfig in FindLAPACK |
276 |
- |
277 |
---- |
278 |
- Modules/FindLAPACK.cmake | 22 ++++++++++++++++++++++ |
279 |
- 1 file changed, 22 insertions(+) |
280 |
- |
281 |
-diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake |
282 |
-index c9629769f0..de852d562c 100644 |
283 |
---- a/Modules/FindLAPACK.cmake |
284 |
-+++ b/Modules/FindLAPACK.cmake |
285 |
-@@ -7,6 +7,10 @@ FindLAPACK |
286 |
- |
287 |
- Find Linear Algebra PACKage (LAPACK) library |
288 |
- |
289 |
-+Version modified for Gentoo Linux. |
290 |
-+If a valid PkgConfig configuration is found, this overrides and cancels |
291 |
-+all further checks. |
292 |
-+ |
293 |
- This module finds an installed Fortran library that implements the |
294 |
- LAPACK linear-algebra interface (see http://www.netlib.org/lapack/). |
295 |
- |
296 |
-@@ -186,6 +190,22 @@ macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _a |
297 |
- #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}") |
298 |
- endmacro() |
299 |
- |
300 |
-+# first, try PkgConfig |
301 |
-+find_package(PkgConfig REQUIRED) |
302 |
-+pkg_check_modules(PC_LAPACK lapack) |
303 |
-+if(PC_LAPACK_FOUND) |
304 |
-+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) |
305 |
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) |
306 |
-+ if (NOT ${PC_LIB}_LIBRARY) |
307 |
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") |
308 |
-+ endif (NOT ${PC_LIB}_LIBRARY) |
309 |
-+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) |
310 |
-+ endforeach(PC_LIB) |
311 |
-+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) |
312 |
-+ mark_as_advanced(LAPACK_LIBRARIES) |
313 |
-+else(PC_LAPACK_FOUND) |
314 |
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") |
315 |
-+ |
316 |
- set(LAPACK_LINKER_FLAGS) |
317 |
- set(LAPACK_LIBRARIES) |
318 |
- set(LAPACK95_LIBRARIES) |
319 |
-@@ -494,3 +514,5 @@ endif() |
320 |
- |
321 |
- cmake_pop_check_state() |
322 |
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |
323 |
-+ |
324 |
-+endif(PC_LAPACK_FOUND) |
325 |
--- |
326 |
-2.25.0 |
327 |
- |