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: Sun, 10 Feb 2019 22:48:07
Message-Id: 1549838848.136edb3a2ea0bbf688acf3e473d4ab2accbc60ea.polynomial-c@gentoo
1 commit: 136edb3a2ea0bbf688acf3e473d4ab2accbc60ea
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 10 22:30:10 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 10 22:47:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=136edb3a
7
8 Revert "dev-util/cmake: Removed old."
9
10 This reverts commit 3dce249a2aa588b4ee4d8235d26b92ef79dc3203.
11
12 Accidentally removed the wrong version.
13
14 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
15
16 dev-util/cmake/Manifest | 1 +
17 dev-util/cmake/cmake-3.13.4.ebuild | 228 +++++++++++++++++++++++++++++++++++++
18 2 files changed, 229 insertions(+)
19
20 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
21 index 36ac0ab6f2f..75582bfc2c4 100644
22 --- a/dev-util/cmake/Manifest
23 +++ b/dev-util/cmake/Manifest
24 @@ -2,5 +2,6 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b
25 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
26 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
27 DIST cmake-3.13.3.tar.gz 8616403 BLAKE2B 1c0df89a8cbed3fe94e9fb1491d77b9b87b3ce4d4dad6e90cf7bd3a259ab4839f941f4f52fb8d1cd89711a2f022d72a638a6e907f8d047419508aebe5bd8255d SHA512 3033c434b6880d76a1496c9b1a32835307296a68e4c677acbe09cadb6562088dc9b04fb314d28b4611a1f4ea4d5a1e41c94e7ccf135f21c372a0eadc25aba585
28 +DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
29 DIST cmake-3.14.0-rc1.tar.gz 8844963 BLAKE2B 1bb600c4fda4da411d3897f55696025d0ff14f80154eeb968c67a1e8dbb308f55d38a4a5a9c420038a1aef1fc181778801f954178d3b625faedd3fc51a18b5c7 SHA512 a7f1881100e1c4ca4944fca1f87ed2caac450983fda4b930954f0d25bf39091e28080e49862060d87ec86e61251c712056d8accddaeedb71715cb9fb01aa4559
30 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
31
32 diff --git a/dev-util/cmake/cmake-3.13.4.ebuild b/dev-util/cmake/cmake-3.13.4.ebuild
33 new file mode 100644
34 index 00000000000..9acfa35ba61
35 --- /dev/null
36 +++ b/dev-util/cmake/cmake-3.13.4.ebuild
37 @@ -0,0 +1,228 @@
38 +# Copyright 1999-2019 Gentoo Authors
39 +# Distributed under the terms of the GNU General Public License v2
40 +
41 +EAPI=6
42 +
43 +CMAKE_MAKEFILE_GENERATOR="emake"
44 +CMAKE_REMOVE_MODULES="no"
45 +inherit bash-completion-r1 elisp-common flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
57 +IUSE="doc emacs system-jsoncpp ncurses qt5"
58 +
59 +RDEPEND="
60 + app-crypt/rhash
61 + >=app-arch/libarchive-3.0.0:=
62 + >=dev-libs/expat-2.0.1
63 + >=dev-libs/libuv-1.10.0:=
64 + >=net-misc/curl-7.21.5[ssl]
65 + sys-libs/zlib
66 + virtual/pkgconfig
67 + emacs? ( virtual/emacs )
68 + ncurses? ( sys-libs/ncurses:0= )
69 + qt5? (
70 + dev-qt/qtcore:5
71 + dev-qt/qtgui:5
72 + dev-qt/qtwidgets:5
73 + )
74 + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
75 +"
76 +DEPEND="${RDEPEND}
77 + doc? (
78 + dev-python/requests
79 + dev-python/sphinx
80 + )
81 +"
82 +
83 +S="${WORKDIR}/${MY_P}"
84 +
85 +SITEFILE="50${PN}-gentoo.el"
86 +
87 +PATCHES=(
88 + # prefix
89 + "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
90 + "${FILESDIR}"/${PN}-3.13.4-prefix-dirs.patch
91 + "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
92 +
93 + # handle gentoo packaging in find modules
94 + "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
95 + "${FILESDIR}"/${PN}-3.0.2-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 + # boost (#660980)
103 + "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
104 +
105 + # upstream fixes (can usually be removed with a version bump)
106 +)
107 +
108 +cmake_src_bootstrap() {
109 + # Cleanup args to extract only JOBS.
110 + # Because bootstrap does not know anything else.
111 + grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
112 + if [[ $? -eq 0 ]] ; then
113 + par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
114 + par_arg="--parallel=${par_arg}"
115 + else
116 + par_arg="--parallel=1"
117 + fi
118 +
119 + # disable running of cmake in boostrap command
120 + sed -i \
121 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
122 + bootstrap || die "sed failed"
123 +
124 + # execinfo.h on Solaris isn't quite what it is on Darwin
125 + if [[ ${CHOST} == *-solaris* ]] ; then
126 + sed -i -e 's/execinfo\.h/blablabla.h/' \
127 + Source/kwsys/CMakeLists.txt || die
128 + fi
129 +
130 + tc-export CC CXX LD
131 +
132 + # bootstrap script isn't exactly /bin/sh compatible
133 + ${CONFIG_SHELL:-sh} ./bootstrap \
134 + --prefix="${T}/cmakestrap/" \
135 + ${par_arg} \
136 + || die "Bootstrap failed"
137 +}
138 +
139 +cmake_src_test() {
140 + # fix OutDir and SelectLibraryConfigurations tests
141 + # these are altered thanks to our eclass
142 + sed -i -e 's:#IGNORE ::g' \
143 + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
144 + || die
145 +
146 + pushd "${BUILD_DIR}" > /dev/null
147 +
148 + local ctestargs
149 + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
150 +
151 + # Excluded tests:
152 + # BootstrapTest: we actualy bootstrap it every time so why test it.
153 + # BundleUtilities: bundle creation broken
154 + # CMakeOnly.AllFindModules: pthread issues
155 + # CTest.updatecvs: which fails to commit as root
156 + # Fortran: requires fortran
157 + # RunCMake.CompilerLauncher: also requires fortran
158 + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
159 + # debugedit binary is not in the expected location
160 + # TestUpload, which requires network access
161 + "${BUILD_DIR}"/bin/ctest \
162 + -j "$(makeopts_jobs)" \
163 + --test-load "$(makeopts_loadavg)" \
164 + ${ctestargs} \
165 + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
166 + || die "Tests failed"
167 +
168 + popd > /dev/null
169 +}
170 +
171 +src_prepare() {
172 + cmake-utils_src_prepare
173 +
174 + # disable Xcode hooks, bug #652134
175 + if [[ ${CHOST} == *-darwin* ]] ; then
176 + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
177 + Source/cmGlobalXCodeGenerator.cxx || die
178 + fi
179 +
180 + # Add gcc libs to the default link paths
181 + sed -i \
182 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
183 + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
184 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
185 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
186 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
187 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
188 + cmake_src_bootstrap
189 + fi
190 +}
191 +
192 +src_configure() {
193 + # Fix linking on Solaris
194 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
195 +
196 + local mycmakeargs=(
197 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
198 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
199 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
200 + -DCMAKE_DOC_DIR=/share/doc/${PF}
201 + -DCMAKE_MAN_DIR=/share/man
202 + -DCMAKE_DATA_DIR=/share/${PN}
203 + -DSPHINX_MAN=$(usex doc)
204 + -DSPHINX_HTML=$(usex doc)
205 + -DBUILD_CursesDialog="$(usex ncurses)"
206 + )
207 +
208 + if use qt5 ; then
209 + mycmakeargs+=(
210 + -DBUILD_QtDialog=ON
211 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
212 + )
213 + fi
214 +
215 + cmake-utils_src_configure
216 +}
217 +
218 +src_compile() {
219 + cmake-utils_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-utils_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 + rm -r "${ED%/}"/usr/share/cmake/{completions,editors} || die
247 +}
248 +
249 +pkg_postinst() {
250 + use emacs && elisp-site-regen
251 + if use qt5; then
252 + gnome2_icon_cache_update
253 + xdg_desktop_database_update
254 + xdg_mimeinfo_database_update
255 + fi
256 +}
257 +
258 +pkg_postrm() {
259 + use emacs && elisp-site-regen
260 + if use qt5; then
261 + gnome2_icon_cache_update
262 + xdg_desktop_database_update
263 + xdg_mimeinfo_database_update
264 + fi
265 +}