1 |
commit: d7167e80d683cbb5420930113daefdd3eb93c909 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 26 15:30:59 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 26 21:19:24 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7167e80 |
7 |
|
8 |
dev-util/cmake: Drop 3.17.4-r1 |
9 |
|
10 |
Package-Manager: Portage-3.0.15, Repoman-3.0.2 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-util/cmake/Manifest | 1 - |
14 |
dev-util/cmake/cmake-3.17.4-r1.ebuild | 223 --------------------- |
15 |
.../cmake/files/cmake-3.17.4-uv-check-return.patch | 46 ----- |
16 |
3 files changed, 270 deletions(-) |
17 |
|
18 |
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest |
19 |
index 43be67cfb53..0da9dc3439e 100644 |
20 |
--- a/dev-util/cmake/Manifest |
21 |
+++ b/dev-util/cmake/Manifest |
22 |
@@ -1,5 +1,4 @@ |
23 |
DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26 |
24 |
-DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e |
25 |
DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343 |
26 |
DIST cmake-3.19.5.tar.gz 9270284 BLAKE2B 4620f5f2a08e16a90350559e539a701606a0e8b4ee358ae5d1668c1f1d43674ac75a06ae335e52363fad9750bde430938faa2497108c2db6038479058412969a SHA512 de8645c7c03bd48987f6eefc19bc2856c2a939e537cf204e1c9749d5a3e21c71695080bee246e94871f82996ede9d1a8771972266434549b48df9924fbb4c6f2 |
27 |
DIST cmake-3.19.6.tar.gz 9270931 BLAKE2B 5480ea3f3d159cd6471623ec73dfd73ab20ceb21744b2acc8bdbd27b8be7338e2ab8ae81366bbc3af474be49723567421450dfd6b7c51c65f36494c04fe13946 SHA512 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9 |
28 |
|
29 |
diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild b/dev-util/cmake/cmake-3.17.4-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 45b0de57b6c..00000000000 |
32 |
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,223 +0,0 @@ |
35 |
-# Copyright 1999-2021 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
41 |
-CMAKE_REMOVE_MODULES_LIST=( none ) |
42 |
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ |
43 |
- toolchain-funcs virtualx xdg-utils |
44 |
- |
45 |
-MY_P="${P/_/-}" |
46 |
- |
47 |
-DESCRIPTION="Cross platform Make" |
48 |
-HOMEPAGE="https://cmake.org/" |
49 |
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" |
50 |
- |
51 |
-LICENSE="CMake" |
52 |
-SLOT="0" |
53 |
-[[ "${PV}" = *_rc* ]] || \ |
54 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
55 |
-IUSE="doc emacs ncurses qt5 test" |
56 |
-RESTRICT="!test? ( test )" |
57 |
- |
58 |
-RDEPEND=" |
59 |
- >=app-arch/libarchive-3.3.3:= |
60 |
- app-crypt/rhash |
61 |
- >=dev-libs/expat-2.0.1 |
62 |
- >=dev-libs/jsoncpp-1.9.2-r2:0= |
63 |
- >=dev-libs/libuv-1.10.0:= |
64 |
- >=net-misc/curl-7.21.5[ssl] |
65 |
- sys-libs/zlib |
66 |
- virtual/pkgconfig |
67 |
- emacs? ( >=app-editors/emacs-23.1:* ) |
68 |
- ncurses? ( sys-libs/ncurses:0= ) |
69 |
- qt5? ( |
70 |
- dev-qt/qtcore:5 |
71 |
- dev-qt/qtgui:5 |
72 |
- dev-qt/qtwidgets:5 |
73 |
- ) |
74 |
-" |
75 |
-DEPEND="${RDEPEND}" |
76 |
-BDEPEND=" |
77 |
- doc? ( |
78 |
- dev-python/requests |
79 |
- dev-python/sphinx |
80 |
- ) |
81 |
-" |
82 |
- |
83 |
-S="${WORKDIR}/${MY_P}" |
84 |
- |
85 |
-SITEFILE="50${PN}-gentoo.el" |
86 |
- |
87 |
-PATCHES=( |
88 |
- # prefix |
89 |
- "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch |
90 |
- "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch |
91 |
- # Next patch requires new work from prefix people |
92 |
- #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch |
93 |
- |
94 |
- # handle gentoo packaging in find modules |
95 |
- "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch |
96 |
- "${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch |
97 |
- "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch |
98 |
- |
99 |
- # respect python eclasses |
100 |
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
101 |
- "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch |
102 |
- |
103 |
- # upstream fixes (can usually be removed with a version bump) |
104 |
- "${FILESDIR}"/${P}-uv-check-return.patch # bug 726962 |
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 |
- tc-export CC CXX LD |
120 |
- |
121 |
- # bootstrap script isn't exactly /bin/sh compatible |
122 |
- ${CONFIG_SHELL:-sh} ./bootstrap \ |
123 |
- --prefix="${T}/cmakestrap/" \ |
124 |
- --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ |
125 |
- || die "Bootstrap failed" |
126 |
-} |
127 |
- |
128 |
-cmake_src_test() { |
129 |
- # fix OutDir and SelectLibraryConfigurations tests |
130 |
- # these are altered thanks to our eclass |
131 |
- sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ |
132 |
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
133 |
- || die |
134 |
- |
135 |
- pushd "${BUILD_DIR}" > /dev/null |
136 |
- |
137 |
- local ctestargs |
138 |
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
139 |
- |
140 |
- # Excluded tests: |
141 |
- # BootstrapTest: we actually bootstrap it every time so why test it. |
142 |
- # BundleUtilities: bundle creation broken |
143 |
- # CMakeOnly.AllFindModules: pthread issues |
144 |
- # CTest.updatecvs: fails to commit as root |
145 |
- # Fortran: requires fortran |
146 |
- # RunCMake.CommandLineTar: whatever... |
147 |
- # RunCMake.CompilerLauncher: also requires fortran |
148 |
- # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because |
149 |
- # debugedit binary is not in the expected location |
150 |
- # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because |
151 |
- # it can't find a deb package that owns libc |
152 |
- # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4 |
153 |
- # TestUpload: requires network access |
154 |
- "${BUILD_DIR}"/bin/ctest \ |
155 |
- -j "$(makeopts_jobs)" \ |
156 |
- --test-load "$(makeopts_loadavg)" \ |
157 |
- ${ctestargs} \ |
158 |
- -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ |
159 |
- || die "Tests failed" |
160 |
- |
161 |
- popd > /dev/null |
162 |
-} |
163 |
- |
164 |
-src_prepare() { |
165 |
- cmake_src_prepare |
166 |
- |
167 |
- # disable Xcode hooks, bug #652134 |
168 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
169 |
- sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ |
170 |
- Source/cmGlobalXCodeGenerator.cxx || die |
171 |
- fi |
172 |
- |
173 |
- # Add gcc libs to the default link paths |
174 |
- sed -i \ |
175 |
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
176 |
- -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ |
177 |
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
178 |
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
179 |
- if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then |
180 |
- CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
181 |
- cmake_src_bootstrap |
182 |
- fi |
183 |
-} |
184 |
- |
185 |
-src_configure() { |
186 |
- # Fix linking on Solaris |
187 |
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl |
188 |
- |
189 |
- local mycmakeargs=( |
190 |
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
191 |
- -DCMAKE_DOC_DIR=/share/doc/${PF} |
192 |
- -DCMAKE_MAN_DIR=/share/man |
193 |
- -DCMAKE_DATA_DIR=/share/${PN} |
194 |
- -DSPHINX_MAN=$(usex doc) |
195 |
- -DSPHINX_HTML=$(usex doc) |
196 |
- -DBUILD_CursesDialog="$(usex ncurses)" |
197 |
- -DBUILD_TESTING=$(usex test) |
198 |
- ) |
199 |
- |
200 |
- if use qt5 ; then |
201 |
- mycmakeargs+=( |
202 |
- -DBUILD_QtDialog=ON |
203 |
- $(cmake_use_find_package qt5 Qt5Widgets) |
204 |
- ) |
205 |
- fi |
206 |
- |
207 |
- cmake_src_configure |
208 |
-} |
209 |
- |
210 |
-src_compile() { |
211 |
- cmake_src_compile |
212 |
- use emacs && elisp-compile Auxiliary/cmake-mode.el |
213 |
-} |
214 |
- |
215 |
-src_test() { |
216 |
- virtx cmake_src_test |
217 |
-} |
218 |
- |
219 |
-src_install() { |
220 |
- cmake_src_install |
221 |
- |
222 |
- if use emacs; then |
223 |
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
224 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
225 |
- fi |
226 |
- |
227 |
- insinto /usr/share/vim/vimfiles/syntax |
228 |
- doins Auxiliary/vim/syntax/cmake.vim |
229 |
- |
230 |
- insinto /usr/share/vim/vimfiles/indent |
231 |
- doins Auxiliary/vim/indent/cmake.vim |
232 |
- |
233 |
- insinto /usr/share/vim/vimfiles/ftdetect |
234 |
- doins "${FILESDIR}/${PN}.vim" |
235 |
- |
236 |
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
237 |
- |
238 |
- rm -r "${ED}"/usr/share/cmake/{completions,editors} || die |
239 |
-} |
240 |
- |
241 |
-pkg_postinst() { |
242 |
- use emacs && elisp-site-regen |
243 |
- if use qt5; then |
244 |
- xdg_icon_cache_update |
245 |
- xdg_desktop_database_update |
246 |
- xdg_mimeinfo_database_update |
247 |
- fi |
248 |
-} |
249 |
- |
250 |
-pkg_postrm() { |
251 |
- use emacs && elisp-site-regen |
252 |
- if use qt5; then |
253 |
- xdg_icon_cache_update |
254 |
- xdg_desktop_database_update |
255 |
- xdg_mimeinfo_database_update |
256 |
- fi |
257 |
-} |
258 |
|
259 |
diff --git a/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch b/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch |
260 |
deleted file mode 100644 |
261 |
index ab4a45a3ec1..00000000000 |
262 |
--- a/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch |
263 |
+++ /dev/null |
264 |
@@ -1,46 +0,0 @@ |
265 |
-From 0fddcc1e5bd8e4672b09e2478edb72e5c0338f1b Mon Sep 17 00:00:00 2001 |
266 |
-From: Brad King <brad.king@×××××××.com> |
267 |
-Date: Wed, 1 Jul 2020 16:23:56 -0400 |
268 |
-Subject: [PATCH] cmake: Tolerate nullptr from uv_default_loop |
269 |
- |
270 |
-`uv_default_loop()` can return `nullptr` when running on a Linux kernel |
271 |
-configured without `CONFIG_EVENTFD`. |
272 |
- |
273 |
-Fixes: #20899 |
274 |
---- |
275 |
- Source/cmSystemTools.cxx | 4 +++- |
276 |
- Source/cmakemain.cxx | 4 +++- |
277 |
- 2 files changed, 6 insertions(+), 2 deletions(-) |
278 |
- |
279 |
-diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx |
280 |
-index be799b0402..2f08b840cd 100644 |
281 |
---- a/Source/cmSystemTools.cxx |
282 |
-+++ b/Source/cmSystemTools.cxx |
283 |
-@@ -823,7 +823,9 @@ void cmSystemTools::InitializeLibUV() |
284 |
- // Perform libuv one-time initialization now, and then un-do its |
285 |
- // global _fmode setting so that using libuv does not change the |
286 |
- // default file text/binary mode. See libuv issue 840. |
287 |
-- uv_loop_close(uv_default_loop()); |
288 |
-+ if (uv_loop_t* loop = uv_default_loop()) { |
289 |
-+ uv_loop_close(loop); |
290 |
-+ } |
291 |
- # ifdef _MSC_VER |
292 |
- _set_fmode(_O_TEXT); |
293 |
- # else |
294 |
-diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx |
295 |
-index 75280fb8a5..e0c17f8d54 100644 |
296 |
---- a/Source/cmakemain.cxx |
297 |
-+++ b/Source/cmakemain.cxx |
298 |
-@@ -717,6 +717,8 @@ int main(int ac, char const* const* av) |
299 |
- #ifndef CMAKE_BOOTSTRAP |
300 |
- cmDynamicLoader::FlushCache(); |
301 |
- #endif |
302 |
-- uv_loop_close(uv_default_loop()); |
303 |
-+ if (uv_loop_t* loop = uv_default_loop()) { |
304 |
-+ uv_loop_close(loop); |
305 |
-+ } |
306 |
- return ret; |
307 |
- } |
308 |
--- |
309 |
-GitLab |
310 |
- |