Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/
Date: Thu, 28 Jan 2021 23:49:50
Message-Id: 1611877781.786078221e2960b3a8b1df4cd6cdc57ce1c17675.polynomial-c@gentoo
1 commit: 786078221e2960b3a8b1df4cd6cdc57ce1c17675
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 28 23:49:33 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 28 23:49:41 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78607822
7
8 dev-util/cmake: Bump to version 3.19.4
9
10 Package-Manager: Portage-3.0.14, Repoman-3.0.2
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 +
14 dev-util/cmake/cmake-3.19.4.ebuild | 230 +++++++++++++++++++++++++++++++++++++
15 2 files changed, 231 insertions(+)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index fd08f540980..01312a5205f 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -2,3 +2,4 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20
22 DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
23 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
24 DIST cmake-3.19.3.tar.gz 9265831 BLAKE2B 133ca8b12c0ccff0f9d833543c66cac597d72898d6e8602c74ef2875c90059b0a19d059b8801e407a7d5931b8aa50b253aef970330454789e13e2e63a7bb6d97 SHA512 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5
25 +DIST cmake-3.19.4.tar.gz 9266976 BLAKE2B b5ac44fa426a47031e37fca990130d9289909a5f21eed2ebb0987da9202db16f654a1f3eeaca2465693b2fca09de05b9bb452dd71df9a65ffd27c02da577a1c5 SHA512 e2781479d2185f8f927439b795120a0f4957e9da7730804ff8ec06d6bbe75a0069e49d95e642706179520a7229ae82e53bab891fa8cfd859913c0cb5fd4e843f
26
27 diff --git a/dev-util/cmake/cmake-3.19.4.ebuild b/dev-util/cmake/cmake-3.19.4.ebuild
28 new file mode 100644
29 index 00000000000..99b8eab6c2f
30 --- /dev/null
31 +++ b/dev-util/cmake/cmake-3.19.4.ebuild
32 @@ -0,0 +1,230 @@
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|CMakeOnly.AllFindModules|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 + fi
185 +
186 + # Add gcc libs to the default link paths
187 + sed -i \
188 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
189 + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
190 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
191 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
192 + if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
193 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
194 + cmake_src_bootstrap
195 + fi
196 +}
197 +
198 +src_configure() {
199 + # Fix linking on Solaris
200 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
201 +
202 + local mycmakeargs=(
203 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
204 + -DCMAKE_DOC_DIR=/share/doc/${PF}
205 + -DCMAKE_MAN_DIR=/share/man
206 + -DCMAKE_DATA_DIR=/share/${PN}
207 + -DSPHINX_MAN=$(usex doc)
208 + -DSPHINX_HTML=$(usex doc)
209 + -DBUILD_CursesDialog="$(usex ncurses)"
210 + -DBUILD_TESTING=$(usex test)
211 + )
212 + use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
213 +
214 + cmake_src_configure
215 +}
216 +
217 +src_compile() {
218 + cmake_src_compile
219 + use emacs && elisp-compile Auxiliary/cmake-mode.el
220 +}
221 +
222 +src_test() {
223 + virtx cmake_src_test
224 +}
225 +
226 +src_install() {
227 + cmake_src_install
228 +
229 + if use emacs; then
230 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
231 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
232 + fi
233 +
234 + insinto /usr/share/vim/vimfiles/syntax
235 + doins Auxiliary/vim/syntax/cmake.vim
236 +
237 + insinto /usr/share/vim/vimfiles/indent
238 + doins Auxiliary/vim/indent/cmake.vim
239 +
240 + insinto /usr/share/vim/vimfiles/ftdetect
241 + doins "${FILESDIR}/${PN}.vim"
242 +
243 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
244 +}
245 +
246 +pkg_postinst() {
247 + use emacs && elisp-site-regen
248 + if use qt5; then
249 + xdg_icon_cache_update
250 + xdg_desktop_database_update
251 + xdg_mimeinfo_database_update
252 + fi
253 +}
254 +
255 +pkg_postrm() {
256 + use emacs && elisp-site-regen
257 + if use qt5; then
258 + xdg_icon_cache_update
259 + xdg_desktop_database_update
260 + xdg_mimeinfo_database_update
261 + fi
262 +}