| 1 |
commit: 65762e0e84ea0125263a5bb0713df130ee98aea7 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 6 18:18:44 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 6 18:19:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65762e0e |
| 7 |
|
| 8 |
dev-util/cmake: Bump to version 3.18.4 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/cmake/Manifest | 1 + |
| 14 |
dev-util/cmake/cmake-3.18.4.ebuild | 214 +++++++++++++++++++++++++++++++++++++ |
| 15 |
2 files changed, 215 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest |
| 18 |
index 6b6e19a4f08..b09e5dedeef 100644 |
| 19 |
--- a/dev-util/cmake/Manifest |
| 20 |
+++ b/dev-util/cmake/Manifest |
| 21 |
@@ -3,3 +3,4 @@ DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eeb |
| 22 |
DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e |
| 23 |
DIST cmake-3.18.2.tar.gz 8970663 BLAKE2B 10924eabbcd20bc3dc2cb6f2d619d824ed0a28fdf35ce6b92ed46d0d85320343d797b0c810aa90ab740477548e3390ed98ec5d2777f635920bff84eecb8e0531 SHA512 74915e643d09af1d8451e57120f2e5963f6fd34ca2cfa0cd573bd7f234924458105e7cc76952c022732de7566cd590141127b243933a564ac575a0dcbb8cc6e7 |
| 24 |
DIST cmake-3.18.3.tar.gz 8976093 BLAKE2B 266432f8647828359e0f1a4390d62ac6449fcee5c7bc95d96fea62bc0ae94af9734edf6e0366efe95e3c65c5f29e16abbec0ae6b086781926ac0ae0a08a64b19 SHA512 28c0c310b6cd8117d4a8b9ad60064b22b00bdc170303b190994e9a3d4fe83fbd9cae6c8f36da62faf6c356b5acf430c78878f19210386ec26844b56334d3941e |
| 25 |
+DIST cmake-3.18.4.tar.gz 8976659 BLAKE2B b121a641f5470c5e210bd0ee5506cdc2165ad186074b54bc81de72f36ff6b5748fe846794eff16a13c52e98ce246561fb1aab0f0fd1fdcf9173c4bdacd9cbb8f SHA512 2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9 |
| 26 |
|
| 27 |
diff --git a/dev-util/cmake/cmake-3.18.4.ebuild b/dev-util/cmake/cmake-3.18.4.ebuild |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..7334e72c320 |
| 30 |
--- /dev/null |
| 31 |
+++ b/dev-util/cmake/cmake-3.18.4.ebuild |
| 32 |
@@ -0,0 +1,214 @@ |
| 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" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460 |
| 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 ~x86-macos ~sparc-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 |
+" |
| 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.17.0_rc1-FindBLAS.patch |
| 94 |
+ "${FILESDIR}"/${PN}-3.17.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 |
+ "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 |
| 102 |
+ |
| 103 |
+ # upstream fixes (can usually be removed with a version bump) |
| 104 |
+) |
| 105 |
+ |
| 106 |
+cmake_src_bootstrap() { |
| 107 |
+ # disable running of cmake in bootstrap command |
| 108 |
+ sed -i \ |
| 109 |
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
| 110 |
+ bootstrap || die "sed failed" |
| 111 |
+ |
| 112 |
+ # execinfo.h on Solaris isn't quite what it is on Darwin |
| 113 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
| 114 |
+ sed -i -e 's/execinfo\.h/blablabla.h/' \ |
| 115 |
+ Source/kwsys/CMakeLists.txt || die |
| 116 |
+ fi |
| 117 |
+ |
| 118 |
+ # bootstrap script isn't exactly /bin/sh compatible |
| 119 |
+ tc-env_build ${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 actually bootstrap it every time so why test it. |
| 139 |
+ # BundleUtilities: bundle creation broken |
| 140 |
+ # CMakeOnly.AllFindModules: pthread issues |
| 141 |
+ # CTest.updatecvs: fails to commit as root |
| 142 |
+ # Fortran: requires fortran |
| 143 |
+ # RunCMake.CommandLineTar: whatever... |
| 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|Fortran|RunCMake.CommandLineTar|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 |
+ # disable Xcode hooks, bug #652134 |
| 165 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 166 |
+ sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ |
| 167 |
+ Source/cmGlobalXCodeGenerator.cxx || die |
| 168 |
+ fi |
| 169 |
+ |
| 170 |
+ # Add gcc libs to the default link paths |
| 171 |
+ sed -i \ |
| 172 |
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
| 173 |
+ -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ |
| 174 |
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
| 175 |
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
| 176 |
+ if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then |
| 177 |
+ CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
| 178 |
+ cmake_src_bootstrap |
| 179 |
+ fi |
| 180 |
+} |
| 181 |
+ |
| 182 |
+src_configure() { |
| 183 |
+ # Fix linking on Solaris |
| 184 |
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl |
| 185 |
+ |
| 186 |
+ local mycmakeargs=( |
| 187 |
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
| 188 |
+ -DCMAKE_DOC_DIR=/share/doc/${PF} |
| 189 |
+ -DCMAKE_MAN_DIR=/share/man |
| 190 |
+ -DCMAKE_DATA_DIR=/share/${PN} |
| 191 |
+ -DSPHINX_MAN=$(usex doc) |
| 192 |
+ -DSPHINX_HTML=$(usex doc) |
| 193 |
+ -DBUILD_CursesDialog="$(usex ncurses)" |
| 194 |
+ -DBUILD_TESTING=$(usex test) |
| 195 |
+ ) |
| 196 |
+ use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) |
| 197 |
+ |
| 198 |
+ cmake_src_configure |
| 199 |
+} |
| 200 |
+ |
| 201 |
+src_compile() { |
| 202 |
+ cmake_src_compile |
| 203 |
+ use emacs && elisp-compile Auxiliary/cmake-mode.el |
| 204 |
+} |
| 205 |
+ |
| 206 |
+src_test() { |
| 207 |
+ virtx cmake_src_test |
| 208 |
+} |
| 209 |
+ |
| 210 |
+src_install() { |
| 211 |
+ cmake_src_install |
| 212 |
+ |
| 213 |
+ if use emacs; then |
| 214 |
+ elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
| 215 |
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 216 |
+ fi |
| 217 |
+ |
| 218 |
+ insinto /usr/share/vim/vimfiles/syntax |
| 219 |
+ doins Auxiliary/vim/syntax/cmake.vim |
| 220 |
+ |
| 221 |
+ insinto /usr/share/vim/vimfiles/indent |
| 222 |
+ doins Auxiliary/vim/indent/cmake.vim |
| 223 |
+ |
| 224 |
+ insinto /usr/share/vim/vimfiles/ftdetect |
| 225 |
+ doins "${FILESDIR}/${PN}.vim" |
| 226 |
+ |
| 227 |
+ dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
| 228 |
+} |
| 229 |
+ |
| 230 |
+pkg_postinst() { |
| 231 |
+ use emacs && elisp-site-regen |
| 232 |
+ if use qt5; then |
| 233 |
+ xdg_icon_cache_update |
| 234 |
+ xdg_desktop_database_update |
| 235 |
+ xdg_mimeinfo_database_update |
| 236 |
+ fi |
| 237 |
+} |
| 238 |
+ |
| 239 |
+pkg_postrm() { |
| 240 |
+ use emacs && elisp-site-regen |
| 241 |
+ if use qt5; then |
| 242 |
+ xdg_icon_cache_update |
| 243 |
+ xdg_desktop_database_update |
| 244 |
+ xdg_mimeinfo_database_update |
| 245 |
+ fi |
| 246 |
+} |
Archives