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, 08 Aug 2019 12:14:34
Message-Id: 1565266454.a5d84b995c3339c87618b670fd53a3bb47e3e0f7.polynomial-c@gentoo
1 commit: a5d84b995c3339c87618b670fd53a3bb47e3e0f7
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 8 12:14:14 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 8 12:14:14 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d84b99
7
8 dev-util/cmake: Bump to version 3.15.2
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 +
14 dev-util/cmake/cmake-3.15.2.ebuild | 226 +++++++++++++++++++++++++++++++++++++
15 2 files changed, 227 insertions(+)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index d20d31b970f..72bd0360ab9 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -1,3 +1,4 @@
22 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
23 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
24 DIST cmake-3.15.1.tar.gz 9268592 BLAKE2B 3b0dbca9203b1029922d06df9abc3bbfa6f7b8320e43b11b468cd7e129171e2bb1b645fc07bf2d46c9b3c08642f1a11741240d0029f96ac3b2d7a8bb44d398da SHA512 6900a84c7764034331fb6f00801841a7a3e667ac39813c35ceb3db983b33a5bf6addbbc8539c39a0c0be9e10204c79d6236886a9d50ce901a56275b53619ec73
25 +DIST cmake-3.15.2.tar.gz 9269449 BLAKE2B 539a1dede60741f5159fef72f6a7fdd7dd4fd457fab73d33f01b042adee7b5179b2b620ece0556f1612745f911ffe6cd714efb18a4663ac67ed6a20e09feb233 SHA512 154494fe4c8673c3b17a6f1823c55f06fbb35d7ea048b63a5c3e3157108f222693cf1606c879a3cf425edea686dfe19e27974b338e5d281ec118b1a51c632ccc
26
27 diff --git a/dev-util/cmake/cmake-3.15.2.ebuild b/dev-util/cmake/cmake-3.15.2.ebuild
28 new file mode 100644
29 index 00000000000..06184a6bfe5
30 --- /dev/null
31 +++ b/dev-util/cmake/cmake-3.15.2.ebuild
32 @@ -0,0 +1,226 @@
33 +# Copyright 1999-2019 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="no"
40 +inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
52 +IUSE="doc emacs system-jsoncpp ncurses qt5 test"
53 +
54 +RDEPEND="
55 + app-crypt/rhash
56 + >=app-arch/libarchive-3.0.0:=
57 + >=dev-libs/expat-2.0.1
58 + >=dev-libs/libuv-1.10.0:=
59 + >=net-misc/curl-7.21.5[ssl]
60 + sys-libs/zlib
61 + virtual/pkgconfig
62 + emacs? ( virtual/emacs )
63 + ncurses? ( sys-libs/ncurses:0= )
64 + qt5? (
65 + dev-qt/qtcore:5
66 + dev-qt/qtgui:5
67 + dev-qt/qtwidgets:5
68 + )
69 + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
70 +"
71 +DEPEND="${RDEPEND}"
72 +BDEPEND="
73 + doc? (
74 + dev-python/requests
75 + dev-python/sphinx
76 + )
77 +"
78 +
79 +S="${WORKDIR}/${MY_P}"
80 +
81 +SITEFILE="50${PN}-gentoo.el"
82 +
83 +PATCHES=(
84 + # prefix
85 + "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
86 + "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
87 + # Next patch requires new work from prefix people
88 + #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
89 +
90 + # handle gentoo packaging in find modules
91 + "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
92 + "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
93 + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
94 +
95 + # respect python eclasses
96 + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
97 + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
98 +
99 + # upstream fixes (can usually be removed with a version bump)
100 +)
101 +
102 +cmake_src_bootstrap() {
103 + # Cleanup args to extract only JOBS.
104 + # Because bootstrap does not know anything else.
105 + grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
106 + if [[ $? -eq 0 ]] ; then
107 + par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
108 + par_arg="--parallel=${par_arg}"
109 + else
110 + par_arg="--parallel=1"
111 + fi
112 +
113 + # disable running of cmake in boostrap command
114 + sed -i \
115 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
116 + bootstrap || die "sed failed"
117 +
118 + # execinfo.h on Solaris isn't quite what it is on Darwin
119 + if [[ ${CHOST} == *-solaris* ]] ; then
120 + sed -i -e 's/execinfo\.h/blablabla.h/' \
121 + Source/kwsys/CMakeLists.txt || die
122 + fi
123 +
124 + tc-export CC CXX LD
125 +
126 + # bootstrap script isn't exactly /bin/sh compatible
127 + ${CONFIG_SHELL:-sh} ./bootstrap \
128 + --prefix="${T}/cmakestrap/" \
129 + ${par_arg} \
130 + || die "Bootstrap failed"
131 +}
132 +
133 +cmake_src_test() {
134 + # fix OutDir and SelectLibraryConfigurations tests
135 + # these are altered thanks to our eclass
136 + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
137 + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
138 + || die
139 +
140 + pushd "${BUILD_DIR}" > /dev/null
141 +
142 + local ctestargs
143 + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
144 +
145 + # Excluded tests:
146 + # BootstrapTest: we actualy bootstrap it every time so why test it.
147 + # BundleUtilities: bundle creation broken
148 + # CMakeOnly.AllFindModules: pthread issues
149 + # CTest.updatecvs: which fails to commit as root
150 + # Fortran: requires fortran
151 + # RunCMake.CompilerLauncher: also requires fortran
152 + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
153 + # debugedit binary is not in the expected location
154 + # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
155 + # it can't find a deb package that owns libc
156 + # TestUpload, which requires network access
157 + "${BUILD_DIR}"/bin/ctest \
158 + -j "$(makeopts_jobs)" \
159 + --test-load "$(makeopts_loadavg)" \
160 + ${ctestargs} \
161 + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
162 + || die "Tests failed"
163 +
164 + popd > /dev/null
165 +}
166 +
167 +src_prepare() {
168 + cmake-utils_src_prepare
169 +
170 + # disable Xcode hooks, bug #652134
171 + if [[ ${CHOST} == *-darwin* ]] ; then
172 + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
173 + Source/cmGlobalXCodeGenerator.cxx || die
174 + fi
175 +
176 + # Add gcc libs to the default link paths
177 + sed -i \
178 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
179 + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
180 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
181 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
182 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
183 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
184 + cmake_src_bootstrap
185 + fi
186 +}
187 +
188 +src_configure() {
189 + # Fix linking on Solaris
190 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
191 +
192 + local mycmakeargs=(
193 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
194 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
195 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
196 + -DCMAKE_DOC_DIR=/share/doc/${PF}
197 + -DCMAKE_MAN_DIR=/share/man
198 + -DCMAKE_DATA_DIR=/share/${PN}
199 + -DSPHINX_MAN=$(usex doc)
200 + -DSPHINX_HTML=$(usex doc)
201 + -DBUILD_CursesDialog="$(usex ncurses)"
202 + -DBUILD_TESTING=$(usex test)
203 + )
204 +
205 + if use qt5 ; then
206 + mycmakeargs+=(
207 + -DBUILD_QtDialog=ON
208 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
209 + )
210 + fi
211 +
212 + cmake-utils_src_configure
213 +}
214 +
215 +src_compile() {
216 + cmake-utils_src_compile
217 + use emacs && elisp-compile Auxiliary/cmake-mode.el
218 +}
219 +
220 +src_test() {
221 + virtx cmake_src_test
222 +}
223 +
224 +src_install() {
225 + cmake-utils_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 + rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
244 +}
245 +
246 +pkg_preinst() {
247 + use qt5 && xdg_pkg_preinst
248 +}
249 +
250 +pkg_postinst() {
251 + use emacs && elisp-site-regen
252 + use qt5 && xdg_pkg_postinst
253 +}
254 +
255 +pkg_postrm() {
256 + use emacs && elisp-site-regen
257 + use qt5 && xdg_pkg_postrm
258 +}