1 |
commit: 55609b09cf54adc320e18ce933a30a1e73698c2a |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 1 07:05:51 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 1 07:06:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55609b09 |
7 |
|
8 |
dev-util/cmake: Bump to version 3.21.0_rc2 |
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.0_rc2.ebuild | 232 +++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 233 insertions(+) |
15 |
|
16 |
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest |
17 |
index b74db3435cf..00271aa315f 100644 |
18 |
--- a/dev-util/cmake/Manifest |
19 |
+++ b/dev-util/cmake/Manifest |
20 |
@@ -3,3 +3,4 @@ DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4 |
21 |
DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a |
22 |
DIST cmake-3.20.4.tar.gz 9440363 BLAKE2B b04cf6e41878b8626b13516ecbe9d27f0fe801437342217389b739f1549743be10620e06aa521de4ab7b1dcb8f0a8208bf8b3805cca54ac782c320d938c8d9b0 SHA512 f53902a917b8d7b949af305afed3b32fcf981c5c647a77ee7a3bcae1bb5620381a1eacdac4b86bd7e5ea0a7806ec5fbd9a4f4853553f78db4d41d7dd2867c99f |
23 |
DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008 |
24 |
+DIST cmake-3.21.0-rc2.tar.gz 9618429 BLAKE2B 03dbe635d64738a8e07c7d47f9cd59e90030845ae016ecde6a43f7d84a67df3d75ec6181d38ce9cf5a61724164ca58ffb3272c46e0b3634b90da129a62dd1825 SHA512 52090e700ed10cba70bcb2d4a2480e9513e5c0a0f0773d9c8d4b25e1d1dec9203f91907f634fe83b6443048a53c6c78ff903bb7d1f981bf5faf58bc970e7ffa6 |
25 |
|
26 |
diff --git a/dev-util/cmake/cmake-3.21.0_rc2.ebuild b/dev-util/cmake/cmake-3.21.0_rc2.ebuild |
27 |
new file mode 100644 |
28 |
index 00000000000..b1cc1455ac6 |
29 |
--- /dev/null |
30 |
+++ b/dev-util/cmake/cmake-3.21.0_rc2.ebuild |
31 |
@@ -0,0 +1,232 @@ |
32 |
+# Copyright 1999-2021 Gentoo Authors |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI=7 |
36 |
+ |
37 |
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja |
38 |
+CMAKE_REMOVE_MODULES_LIST=( none ) |
39 |
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ |
40 |
+ toolchain-funcs virtualx xdg-utils |
41 |
+ |
42 |
+MY_P="${P/_/-}" |
43 |
+ |
44 |
+DESCRIPTION="Cross platform Make" |
45 |
+HOMEPAGE="https://cmake.org/" |
46 |
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="CMake" |
49 |
+SLOT="0" |
50 |
+[[ "${PV}" = *_rc* ]] || \ |
51 |
+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" |
52 |
+IUSE="doc emacs ncurses qt5 test" |
53 |
+RESTRICT="!test? ( test )" |
54 |
+ |
55 |
+RDEPEND=" |
56 |
+ >=app-arch/libarchive-3.3.3:= |
57 |
+ app-crypt/rhash |
58 |
+ >=dev-libs/expat-2.0.1 |
59 |
+ >=dev-libs/jsoncpp-1.9.2-r2:0= |
60 |
+ >=dev-libs/libuv-1.10.0:= |
61 |
+ >=net-misc/curl-7.21.5[ssl] |
62 |
+ sys-libs/zlib |
63 |
+ virtual/pkgconfig |
64 |
+ emacs? ( >=app-editors/emacs-23.1:* ) |
65 |
+ ncurses? ( sys-libs/ncurses:0= ) |
66 |
+ qt5? ( |
67 |
+ dev-qt/qtcore:5 |
68 |
+ dev-qt/qtgui:5 |
69 |
+ dev-qt/qtwidgets:5 |
70 |
+ ) |
71 |
+" |
72 |
+DEPEND="${RDEPEND}" |
73 |
+BDEPEND=" |
74 |
+ doc? ( |
75 |
+ dev-python/requests |
76 |
+ dev-python/sphinx |
77 |
+ ) |
78 |
+ test? ( app-arch/libarchive[zstd] ) |
79 |
+" |
80 |
+ |
81 |
+S="${WORKDIR}/${MY_P}" |
82 |
+ |
83 |
+SITEFILE="50${PN}-gentoo.el" |
84 |
+ |
85 |
+PATCHES=( |
86 |
+ # prefix |
87 |
+ "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch |
88 |
+ "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch |
89 |
+ "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch |
90 |
+ |
91 |
+ # handle gentoo packaging in find modules |
92 |
+ "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch |
93 |
+ # Next patch needs to be reworked |
94 |
+ #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch |
95 |
+ "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch |
96 |
+ |
97 |
+ # respect python eclasses |
98 |
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
99 |
+ "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch |
100 |
+ |
101 |
+ "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 |
102 |
+ |
103 |
+ # upstream fixes (can usually be removed with a version bump) |
104 |
+) |
105 |
+ |
106 |
+cmake_src_bootstrap() { |
107 |
+ # disable running of cmake in bootstrap command |
108 |
+ sed -i \ |
109 |
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
110 |
+ bootstrap || die "sed failed" |
111 |
+ |
112 |
+ # execinfo.h on Solaris isn't quite what it is on Darwin |
113 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
114 |
+ sed -i -e 's/execinfo\.h/blablabla.h/' \ |
115 |
+ Source/kwsys/CMakeLists.txt || die |
116 |
+ fi |
117 |
+ |
118 |
+ # bootstrap script isn't exactly /bin/sh compatible |
119 |
+ tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ |
120 |
+ --prefix="${T}/cmakestrap/" \ |
121 |
+ --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ |
122 |
+ || die "Bootstrap failed" |
123 |
+} |
124 |
+ |
125 |
+cmake_src_test() { |
126 |
+ # fix OutDir and SelectLibraryConfigurations tests |
127 |
+ # these are altered thanks to our eclass |
128 |
+ sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ |
129 |
+ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
130 |
+ || die |
131 |
+ |
132 |
+ pushd "${BUILD_DIR}" > /dev/null |
133 |
+ |
134 |
+ local ctestargs |
135 |
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
136 |
+ |
137 |
+ # Excluded tests: |
138 |
+ # BootstrapTest: we actually bootstrap it every time so why test it. |
139 |
+ # BundleUtilities: bundle creation broken |
140 |
+ # CMakeOnly.AllFindModules: pthread issues |
141 |
+ # CTest.updatecvs: fails to commit as root |
142 |
+ # Fortran: requires fortran |
143 |
+ # RunCMake.CompilerLauncher: also requires fortran |
144 |
+ # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because |
145 |
+ # debugedit binary is not in the expected location |
146 |
+ # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because |
147 |
+ # it can't find a deb package that owns libc |
148 |
+ # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4 |
149 |
+ # TestUpload: requires network access |
150 |
+ "${BUILD_DIR}"/bin/ctest \ |
151 |
+ -j "$(makeopts_jobs)" \ |
152 |
+ --test-load "$(makeopts_loadavg)" \ |
153 |
+ ${ctestargs} \ |
154 |
+ -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)" \ |
155 |
+ || die "Tests failed" |
156 |
+ |
157 |
+ popd > /dev/null |
158 |
+} |
159 |
+ |
160 |
+src_prepare() { |
161 |
+ cmake_src_prepare |
162 |
+ |
163 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
164 |
+ # disable Xcode hooks, bug #652134 |
165 |
+ sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ |
166 |
+ Source/CMakeLists.txt || die |
167 |
+ sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ |
168 |
+ -e '/cmGlobalXCodeGenerator.h/d' \ |
169 |
+ Source/cmake.cxx || die |
170 |
+ # disable isysroot usage with GCC, we've properly instructed |
171 |
+ # where things are via GCC configuration and ldwrapper |
172 |
+ sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ |
173 |
+ Modules/Platform/Apple-GNU-*.cmake || die |
174 |
+ # disable isysroot usage with clang as well |
175 |
+ sed -i -e '/_SYSROOT_FLAG/d' \ |
176 |
+ Modules/Platform/Apple-Clang.cmake || die |
177 |
+ # don't set a POSIX standard, system headers don't like that, #757426 |
178 |
+ sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ |
179 |
+ Source/cmLoadCommandCommand.cxx \ |
180 |
+ Source/cmStandardLexer.h \ |
181 |
+ Source/cmSystemTools.cxx \ |
182 |
+ Source/cmTimestamp.cxx |
183 |
+ sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ |
184 |
+ Source/cmStandardLexer.h |
185 |
+ fi |
186 |
+ |
187 |
+ # Add gcc libs to the default link paths |
188 |
+ sed -i \ |
189 |
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
190 |
+ -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ |
191 |
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
192 |
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
193 |
+ if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then |
194 |
+ CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
195 |
+ cmake_src_bootstrap |
196 |
+ fi |
197 |
+} |
198 |
+ |
199 |
+src_configure() { |
200 |
+ # Fix linking on Solaris |
201 |
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl |
202 |
+ |
203 |
+ local mycmakeargs=( |
204 |
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
205 |
+ -DCMAKE_DOC_DIR=/share/doc/${PF} |
206 |
+ -DCMAKE_MAN_DIR=/share/man |
207 |
+ -DCMAKE_DATA_DIR=/share/${PN} |
208 |
+ -DSPHINX_MAN=$(usex doc) |
209 |
+ -DSPHINX_HTML=$(usex doc) |
210 |
+ -DBUILD_CursesDialog="$(usex ncurses)" |
211 |
+ -DBUILD_TESTING=$(usex test) |
212 |
+ ) |
213 |
+ use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) |
214 |
+ |
215 |
+ cmake_src_configure |
216 |
+} |
217 |
+ |
218 |
+src_compile() { |
219 |
+ cmake_src_compile |
220 |
+ use emacs && elisp-compile Auxiliary/cmake-mode.el |
221 |
+} |
222 |
+ |
223 |
+src_test() { |
224 |
+ virtx cmake_src_test |
225 |
+} |
226 |
+ |
227 |
+src_install() { |
228 |
+ cmake_src_install |
229 |
+ |
230 |
+ if use emacs; then |
231 |
+ elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
232 |
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
233 |
+ fi |
234 |
+ |
235 |
+ insinto /usr/share/vim/vimfiles/syntax |
236 |
+ doins Auxiliary/vim/syntax/cmake.vim |
237 |
+ |
238 |
+ insinto /usr/share/vim/vimfiles/indent |
239 |
+ doins Auxiliary/vim/indent/cmake.vim |
240 |
+ |
241 |
+ insinto /usr/share/vim/vimfiles/ftdetect |
242 |
+ doins "${FILESDIR}/${PN}.vim" |
243 |
+ |
244 |
+ dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
245 |
+} |
246 |
+ |
247 |
+pkg_postinst() { |
248 |
+ use emacs && elisp-site-regen |
249 |
+ if use qt5; then |
250 |
+ xdg_icon_cache_update |
251 |
+ xdg_desktop_database_update |
252 |
+ xdg_mimeinfo_database_update |
253 |
+ fi |
254 |
+} |
255 |
+ |
256 |
+pkg_postrm() { |
257 |
+ use emacs && elisp-site-regen |
258 |
+ if use qt5; then |
259 |
+ xdg_icon_cache_update |
260 |
+ xdg_desktop_database_update |
261 |
+ xdg_mimeinfo_database_update |
262 |
+ fi |
263 |
+} |