Gentoo Archives: gentoo-commits

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