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/files/, dev-util/cmake/
Date: Sat, 22 Jun 2019 14:49:49
Message-Id: 1561214981.674ddc76cad685d358e7129404244beb9be75135.polynomial-c@gentoo
1 commit: 674ddc76cad685d358e7129404244beb9be75135
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 22 14:48:48 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 22 14:49:41 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=674ddc76
7
8 dev-util/cmake: Bump to version 3.15.0_rc2
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.15
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.0_rc2.ebuild | 224 +++++++++++++++++++++
15 .../cmake/files/cmake-3.15.0_rc2-FindBLAS.patch | 37 ++++
16 3 files changed, 262 insertions(+)
17
18 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
19 index a0243d340bd..204d0c8adf4 100644
20 --- a/dev-util/cmake/Manifest
21 +++ b/dev-util/cmake/Manifest
22 @@ -1,2 +1,3 @@
23 DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
24 DIST cmake-3.14.5.tar.gz 8854929 BLAKE2B 3e783de1ce541039c80228a56fed4fd28e9ef2ea48f274995f6f26f8b149f1684aab6da518f27106f364a4f0a6f370334f3a85dd61f1bcce22c34337ef4afdaa SHA512 9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46
25 +DIST cmake-3.15.0-rc2.tar.gz 9253778 BLAKE2B 141fa60dcf18cb2ea0d97eca88da61ffdf5e0551172ab01c87e2637dc543218f19edd156e0d288458d2797474523b34830d70d38daa759e7b15aaaa318ca86e4 SHA512 397232f6d9742df9fd11fa02f5377613039bf62c6782e835a06a0c0e3a4da0742d608a2bf110d750336ce68b19fed1482b5df14ab9bef933c2054468d9488387
26
27 diff --git a/dev-util/cmake/cmake-3.15.0_rc2.ebuild b/dev-util/cmake/cmake-3.15.0_rc2.ebuild
28 new file mode 100644
29 index 00000000000..b8f071ece70
30 --- /dev/null
31 +++ b/dev-util/cmake/cmake-3.15.0_rc2.ebuild
32 @@ -0,0 +1,224 @@
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:#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 + # TestUpload, which requires network access
155 + "${BUILD_DIR}"/bin/ctest \
156 + -j "$(makeopts_jobs)" \
157 + --test-load "$(makeopts_loadavg)" \
158 + ${ctestargs} \
159 + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
160 + || die "Tests failed"
161 +
162 + popd > /dev/null
163 +}
164 +
165 +src_prepare() {
166 + cmake-utils_src_prepare
167 +
168 + # disable Xcode hooks, bug #652134
169 + if [[ ${CHOST} == *-darwin* ]] ; then
170 + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
171 + Source/cmGlobalXCodeGenerator.cxx || die
172 + fi
173 +
174 + # Add gcc libs to the default link paths
175 + sed -i \
176 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
177 + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
178 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
179 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
180 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
181 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
182 + cmake_src_bootstrap
183 + fi
184 +}
185 +
186 +src_configure() {
187 + # Fix linking on Solaris
188 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
189 +
190 + local mycmakeargs=(
191 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
192 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
193 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
194 + -DCMAKE_DOC_DIR=/share/doc/${PF}
195 + -DCMAKE_MAN_DIR=/share/man
196 + -DCMAKE_DATA_DIR=/share/${PN}
197 + -DSPHINX_MAN=$(usex doc)
198 + -DSPHINX_HTML=$(usex doc)
199 + -DBUILD_CursesDialog="$(usex ncurses)"
200 + -DBUILD_TESTING=$(usex test)
201 + )
202 +
203 + if use qt5 ; then
204 + mycmakeargs+=(
205 + -DBUILD_QtDialog=ON
206 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
207 + )
208 + fi
209 +
210 + cmake-utils_src_configure
211 +}
212 +
213 +src_compile() {
214 + cmake-utils_src_compile
215 + use emacs && elisp-compile Auxiliary/cmake-mode.el
216 +}
217 +
218 +src_test() {
219 + virtx cmake_src_test
220 +}
221 +
222 +src_install() {
223 + cmake-utils_src_install
224 +
225 + if use emacs; then
226 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
227 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
228 + fi
229 +
230 + insinto /usr/share/vim/vimfiles/syntax
231 + doins Auxiliary/vim/syntax/cmake.vim
232 +
233 + insinto /usr/share/vim/vimfiles/indent
234 + doins Auxiliary/vim/indent/cmake.vim
235 +
236 + insinto /usr/share/vim/vimfiles/ftdetect
237 + doins "${FILESDIR}/${PN}.vim"
238 +
239 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
240 +
241 + rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
242 +}
243 +
244 +pkg_preinst() {
245 + use qt5 && xdg_pkg_preinst
246 +}
247 +
248 +pkg_postinst() {
249 + use emacs && elisp-site-regen
250 + use qt5 && xdg_pkg_postinst
251 +}
252 +
253 +pkg_postrm() {
254 + use emacs && elisp-site-regen
255 + use qt5 && xdg_pkg_postrm
256 +}
257
258 diff --git a/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch
259 new file mode 100644
260 index 00000000000..64ab5612b86
261 --- /dev/null
262 +++ b/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch
263 @@ -0,0 +1,37 @@
264 +From 4de8287ce3b098ea579a28155d442eb589db8617 Mon Sep 17 00:00:00 2001
265 +From: Lars Wendler <polynomial-c@g.o>
266 +Date: Sat, 22 Jun 2019 16:09:05 +0200
267 +Subject: [PATCH] Prefer pkgconfig in FindBLAS
268 +
269 +---
270 + Modules/FindBLAS.cmake | 7 +++++++
271 + 1 file changed, 7 insertions(+)
272 +
273 +diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
274 +index 77f9d0e40c..bbe155caa9 100644
275 +--- a/Modules/FindBLAS.cmake
276 ++++ b/Modules/FindBLAS.cmake
277 +@@ -7,6 +7,10 @@ FindBLAS
278 +
279 + Find Basic Linear Algebra Subprograms (BLAS) library
280 +
281 ++Version modified for Gentoo Linux.
282 ++If a valid PkgConfig configuration is found, this overrides and cancels
283 ++all further checks.
284 ++
285 + This module finds an installed Fortran library that implements the
286 + BLAS linear-algebra interface (see http://www.netlib.org/blas/). The
287 + list of libraries searched for is taken from the ``autoconf`` macro file,
288 +@@ -92,6 +96,9 @@ installation.
289 +
290 + #]=======================================================================]
291 +
292 ++# first, try PkgConfig
293 ++set(BLA_PREFER_PKGCONFIG On)
294 ++
295 + include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
296 + include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
297 + include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
298 +--
299 +2.22.0
300 +