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, 06 Feb 2020 16:45:16
Message-Id: 1581007507.ee6f871a50918e0bb0510266b1e91a2c7febb0f4.polynomial-c@gentoo
1 commit: ee6f871a50918e0bb0510266b1e91a2c7febb0f4
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 6 15:24:14 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 6 16:45:07 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee6f871a
7
8 dev-util/cmake: Bump to version 3.16.4
9
10 Package-Manager: Portage-2.3.87, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 +
14 dev-util/cmake/cmake-3.16.4.ebuild | 217 +++++++++++++++++++++++++++++++++++++
15 2 files changed, 218 insertions(+)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index 31613f694ee..172c0c7534f 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.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
23 DIST cmake-3.16.2.tar.gz 9109837 BLAKE2B a574325eb1f4c59a5745e3fe1def5ac53c36d4ce8dd74e051d8f4fbf41dab1d0134cf04541c1757df178def1eb65bd0536f1db132f5f9ca894870da1daf5901d SHA512 b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76
24 DIST cmake-3.16.3.tar.gz 9111826 BLAKE2B 578c070457074a611504c0113b12bdfc8831c7e2cd523dfb038279404712456032646b107ca4d7d8dbff227e4f326ab053d90e3925a22a68a37d5c4e0d818bb2 SHA512 ca9e0a142369735ef6469afb97f4463c981404bd59c7d48c1ef454dd705460a31a5dcffa4949b84b1ac723f5b7e79d67b250126fb42e1f15dab0ac2a17603672
25 +DIST cmake-3.16.4.tar.gz 9113021 BLAKE2B 5aa34cadec4ed09e4d0c46f6983b88cf81ea719c47a0848a21be36911b223d9e609bdc7f5b52086762ab83e4230a3ec9e38d9c9e3c9c6f508aa2118e769e3783 SHA512 4aa36608bac3b9e29ea765003cdc684733c025d7b18fbae057f3be1f726a159d4b0231b8b1be269206aa7dbd7177fe0110d5bac8d72fb0f6ad392bb284b1fce3
26
27 diff --git a/dev-util/cmake/cmake-3.16.4.ebuild b/dev-util/cmake/cmake-3.16.4.ebuild
28 new file mode 100644
29 index 00000000000..e12b038dca3
30 --- /dev/null
31 +++ b/dev-util/cmake/cmake-3.16.4.ebuild
32 @@ -0,0 +1,217 @@
33 +# Copyright 1999-2020 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +CMAKE_MAKEFILE_GENERATOR="emake"
39 +CMAKE_REMOVE_MODULES_LIST=( none )
40 +inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
41 + toolchain-funcs virtualx xdg cmake
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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
53 +IUSE="doc emacs ncurses qt5 test"
54 +RESTRICT="!test? ( test )"
55 +
56 +RDEPEND="
57 + app-crypt/rhash
58 + >=app-arch/libarchive-3.0.0:=
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 +"
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 + # Next patch requires new work from prefix people
90 + #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
91 +
92 + # handle gentoo packaging in find modules
93 + "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
94 + "${FILESDIR}"/${PN}-3.14.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 + # upstream fixes (can usually be removed with a version bump)
102 +)
103 +
104 +cmake_src_bootstrap() {
105 + # disable running of cmake in boostrap command
106 + sed -i \
107 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
108 + bootstrap || die "sed failed"
109 +
110 + # execinfo.h on Solaris isn't quite what it is on Darwin
111 + if [[ ${CHOST} == *-solaris* ]] ; then
112 + sed -i -e 's/execinfo\.h/blablabla.h/' \
113 + Source/kwsys/CMakeLists.txt || die
114 + fi
115 +
116 + tc-export CC CXX LD
117 +
118 + # bootstrap script isn't exactly /bin/sh compatible
119 + ${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 actualy bootstrap it every time so why test it.
139 + # BundleUtilities: bundle creation broken
140 + # CMakeOnly.AllFindModules: pthread issues
141 + # CTest.updatecvs: which 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 + # TestUpload, which requires network access
149 + "${BUILD_DIR}"/bin/ctest \
150 + -j "$(makeopts_jobs)" \
151 + --test-load "$(makeopts_loadavg)" \
152 + ${ctestargs} \
153 + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
154 + || die "Tests failed"
155 +
156 + popd > /dev/null
157 +}
158 +
159 +src_prepare() {
160 + cmake_src_prepare
161 +
162 + # disable Xcode hooks, bug #652134
163 + if [[ ${CHOST} == *-darwin* ]] ; then
164 + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
165 + Source/cmGlobalXCodeGenerator.cxx || die
166 + fi
167 +
168 + # Add gcc libs to the default link paths
169 + sed -i \
170 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
171 + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
172 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
173 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
174 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
175 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
176 + cmake_src_bootstrap
177 + fi
178 +}
179 +
180 +src_configure() {
181 + # Fix linking on Solaris
182 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
183 +
184 + local mycmakeargs=(
185 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
186 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
187 + -DCMAKE_DOC_DIR=/share/doc/${PF}
188 + -DCMAKE_MAN_DIR=/share/man
189 + -DCMAKE_DATA_DIR=/share/${PN}
190 + -DSPHINX_MAN=$(usex doc)
191 + -DSPHINX_HTML=$(usex doc)
192 + -DBUILD_CursesDialog="$(usex ncurses)"
193 + -DBUILD_TESTING=$(usex test)
194 + )
195 +
196 + if use qt5 ; then
197 + mycmakeargs+=(
198 + -DBUILD_QtDialog=ON
199 + $(cmake_use_find_package qt5 Qt5Widgets)
200 + )
201 + fi
202 +
203 + cmake_src_configure
204 +}
205 +
206 +src_compile() {
207 + cmake_src_compile
208 + use emacs && elisp-compile Auxiliary/cmake-mode.el
209 +}
210 +
211 +src_test() {
212 + virtx cmake_src_test
213 +}
214 +
215 +src_install() {
216 + cmake_src_install
217 +
218 + if use emacs; then
219 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
220 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
221 + fi
222 +
223 + insinto /usr/share/vim/vimfiles/syntax
224 + doins Auxiliary/vim/syntax/cmake.vim
225 +
226 + insinto /usr/share/vim/vimfiles/indent
227 + doins Auxiliary/vim/indent/cmake.vim
228 +
229 + insinto /usr/share/vim/vimfiles/ftdetect
230 + doins "${FILESDIR}/${PN}.vim"
231 +
232 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
233 +
234 + rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
235 +}
236 +
237 +pkg_preinst() {
238 + use qt5 && xdg_pkg_preinst
239 +}
240 +
241 +pkg_postinst() {
242 + use emacs && elisp-site-regen
243 + use qt5 && xdg_pkg_postinst
244 +}
245 +
246 +pkg_postrm() {
247 + use emacs && elisp-site-regen
248 + use qt5 && xdg_pkg_postrm
249 +}