| 1 |
commit: 24bbcc13b55adc06848aa413247879668ae6ec91 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 1 07:54:04 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 2 10:43:40 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24bbcc13 |
| 7 |
|
| 8 |
dev-util/cmake: Drop 3.18.5 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/cmake/Manifest | 1 - |
| 14 |
dev-util/cmake/cmake-3.18.5.ebuild | 214 --------------------- |
| 15 |
.../cmake/files/cmake-3.1.0-darwin-isysroot.patch | 48 ----- |
| 16 |
3 files changed, 263 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest |
| 19 |
index 12801dd1c3c..902fc967b3c 100644 |
| 20 |
--- a/dev-util/cmake/Manifest |
| 21 |
+++ b/dev-util/cmake/Manifest |
| 22 |
@@ -1,4 +1,3 @@ |
| 23 |
-DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343 |
| 24 |
DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008 |
| 25 |
DIST cmake-3.21.1.tar.gz 9629567 BLAKE2B 1f33117f6fe3491923d053e4d025741340eff477a7a34ef26a6185d7e8f197d159a4cb45b0d79af3298939f8970c27e663a6011fcf479405d458b294fdf3dd72 SHA512 1453b1f5139950f501c570c305257e4e5dacb8224944de8ed1489aae162c6dd75fe1cd5188d619c47e4e53ca5b846f07318ffb3ab004a0547f2c8b13f60083b4 |
| 26 |
DIST cmake-3.21.2.tar.gz 9630492 BLAKE2B 7c73cad02ee9dbadd8cbf60994856ccb6fd3721cbb7a58d66638169cf99426d8ad732de912ee5c736466d64c145a68a102db93cb5d4d0dbde001681edbf7a200 SHA512 75649404564aaa6175a8c66ab19a10318066dbb667806c287e3cb125ac4c16c1629c160e355bcc50864a38d5488b1f7d1bc77acc602f5f3edd5f68691ae5080d |
| 27 |
|
| 28 |
diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index f3b61204861..00000000000 |
| 31 |
--- a/dev-util/cmake/cmake-3.18.5.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,214 +0,0 @@ |
| 34 |
-# Copyright 1999-2021 Gentoo Authors |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
- |
| 37 |
-EAPI=7 |
| 38 |
- |
| 39 |
-CMAKE_MAKEFILE_GENERATOR="emake" # Fixed in 3.19, see commit 491dddfb; bug #596460 |
| 40 |
-CMAKE_REMOVE_MODULES_LIST=( none ) |
| 41 |
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ |
| 42 |
- toolchain-funcs virtualx xdg-utils |
| 43 |
- |
| 44 |
-MY_P="${P/_/-}" |
| 45 |
- |
| 46 |
-DESCRIPTION="Cross platform Make" |
| 47 |
-HOMEPAGE="https://cmake.org/" |
| 48 |
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" |
| 49 |
- |
| 50 |
-LICENSE="CMake" |
| 51 |
-SLOT="0" |
| 52 |
-[[ "${PV}" = *_rc* ]] || \ |
| 53 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 54 |
-IUSE="doc emacs ncurses qt5 test" |
| 55 |
-RESTRICT="!test? ( test )" |
| 56 |
- |
| 57 |
-RDEPEND=" |
| 58 |
- >=app-arch/libarchive-3.3.3:= |
| 59 |
- app-crypt/rhash |
| 60 |
- >=dev-libs/expat-2.0.1 |
| 61 |
- >=dev-libs/jsoncpp-1.9.2-r2:0= |
| 62 |
- >=dev-libs/libuv-1.10.0:= |
| 63 |
- >=net-misc/curl-7.21.5[ssl] |
| 64 |
- sys-libs/zlib |
| 65 |
- virtual/pkgconfig |
| 66 |
- emacs? ( >=app-editors/emacs-23.1:* ) |
| 67 |
- ncurses? ( sys-libs/ncurses:0= ) |
| 68 |
- qt5? ( |
| 69 |
- dev-qt/qtcore:5 |
| 70 |
- dev-qt/qtgui:5 |
| 71 |
- dev-qt/qtwidgets:5 |
| 72 |
- ) |
| 73 |
-" |
| 74 |
-DEPEND="${RDEPEND}" |
| 75 |
-BDEPEND=" |
| 76 |
- doc? ( |
| 77 |
- dev-python/requests |
| 78 |
- <dev-python/sphinx-4 |
| 79 |
- ) |
| 80 |
- test? ( app-arch/libarchive[zstd] ) |
| 81 |
-" |
| 82 |
- |
| 83 |
-S="${WORKDIR}/${MY_P}" |
| 84 |
- |
| 85 |
-SITEFILE="50${PN}-gentoo.el" |
| 86 |
- |
| 87 |
-PATCHES=( |
| 88 |
- # prefix |
| 89 |
- "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch |
| 90 |
- "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch |
| 91 |
- # Next patch requires new work from prefix people |
| 92 |
- #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch |
| 93 |
- |
| 94 |
- # handle gentoo packaging in find modules |
| 95 |
- "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch |
| 96 |
- "${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch |
| 97 |
- "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch |
| 98 |
- |
| 99 |
- # respect python eclasses |
| 100 |
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
| 101 |
- "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch |
| 102 |
- |
| 103 |
- "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 |
| 104 |
- |
| 105 |
- # upstream fixes (can usually be removed with a version bump) |
| 106 |
-) |
| 107 |
- |
| 108 |
-cmake_src_bootstrap() { |
| 109 |
- # disable running of cmake in bootstrap command |
| 110 |
- sed -i \ |
| 111 |
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
| 112 |
- bootstrap || die "sed failed" |
| 113 |
- |
| 114 |
- # execinfo.h on Solaris isn't quite what it is on Darwin |
| 115 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
| 116 |
- sed -i -e 's/execinfo\.h/blablabla.h/' \ |
| 117 |
- Source/kwsys/CMakeLists.txt || die |
| 118 |
- fi |
| 119 |
- |
| 120 |
- # bootstrap script isn't exactly /bin/sh compatible |
| 121 |
- tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ |
| 122 |
- --prefix="${T}/cmakestrap/" \ |
| 123 |
- --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ |
| 124 |
- || die "Bootstrap failed" |
| 125 |
-} |
| 126 |
- |
| 127 |
-cmake_src_test() { |
| 128 |
- # fix OutDir and SelectLibraryConfigurations tests |
| 129 |
- # these are altered thanks to our eclass |
| 130 |
- sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ |
| 131 |
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
| 132 |
- || die |
| 133 |
- |
| 134 |
- pushd "${BUILD_DIR}" > /dev/null |
| 135 |
- |
| 136 |
- local ctestargs |
| 137 |
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
| 138 |
- |
| 139 |
- # Excluded tests: |
| 140 |
- # BootstrapTest: we actually bootstrap it every time so why test it. |
| 141 |
- # BundleUtilities: bundle creation broken |
| 142 |
- # CMakeOnly.AllFindModules: pthread issues |
| 143 |
- # CTest.updatecvs: fails to commit as root |
| 144 |
- # Fortran: requires fortran |
| 145 |
- # RunCMake.CompilerLauncher: also requires fortran |
| 146 |
- # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because |
| 147 |
- # debugedit binary is not in the expected location |
| 148 |
- # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because |
| 149 |
- # it can't find a deb package that owns libc |
| 150 |
- # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4 |
| 151 |
- # TestUpload: requires network access |
| 152 |
- "${BUILD_DIR}"/bin/ctest \ |
| 153 |
- -j "$(makeopts_jobs)" \ |
| 154 |
- --test-load "$(makeopts_loadavg)" \ |
| 155 |
- ${ctestargs} \ |
| 156 |
- -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ |
| 157 |
- || die "Tests failed" |
| 158 |
- |
| 159 |
- popd > /dev/null |
| 160 |
-} |
| 161 |
- |
| 162 |
-src_prepare() { |
| 163 |
- cmake_src_prepare |
| 164 |
- |
| 165 |
- # disable Xcode hooks, bug #652134 |
| 166 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
| 167 |
- sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ |
| 168 |
- Source/cmGlobalXCodeGenerator.cxx || die |
| 169 |
- fi |
| 170 |
- |
| 171 |
- # Add gcc libs to the default link paths |
| 172 |
- sed -i \ |
| 173 |
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
| 174 |
- -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ |
| 175 |
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
| 176 |
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
| 177 |
- if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then |
| 178 |
- CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
| 179 |
- cmake_src_bootstrap |
| 180 |
- fi |
| 181 |
-} |
| 182 |
- |
| 183 |
-src_configure() { |
| 184 |
- # Fix linking on Solaris |
| 185 |
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl |
| 186 |
- |
| 187 |
- local mycmakeargs=( |
| 188 |
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
| 189 |
- -DCMAKE_DOC_DIR=/share/doc/${PF} |
| 190 |
- -DCMAKE_MAN_DIR=/share/man |
| 191 |
- -DCMAKE_DATA_DIR=/share/${PN} |
| 192 |
- -DSPHINX_MAN=$(usex doc) |
| 193 |
- -DSPHINX_HTML=$(usex doc) |
| 194 |
- -DBUILD_CursesDialog="$(usex ncurses)" |
| 195 |
- -DBUILD_TESTING=$(usex test) |
| 196 |
- ) |
| 197 |
- use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) |
| 198 |
- |
| 199 |
- cmake_src_configure |
| 200 |
-} |
| 201 |
- |
| 202 |
-src_compile() { |
| 203 |
- cmake_src_compile |
| 204 |
- use emacs && elisp-compile Auxiliary/cmake-mode.el |
| 205 |
-} |
| 206 |
- |
| 207 |
-src_test() { |
| 208 |
- virtx cmake_src_test |
| 209 |
-} |
| 210 |
- |
| 211 |
-src_install() { |
| 212 |
- cmake_src_install |
| 213 |
- |
| 214 |
- if use emacs; then |
| 215 |
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
| 216 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 217 |
- fi |
| 218 |
- |
| 219 |
- insinto /usr/share/vim/vimfiles/syntax |
| 220 |
- doins Auxiliary/vim/syntax/cmake.vim |
| 221 |
- |
| 222 |
- insinto /usr/share/vim/vimfiles/indent |
| 223 |
- doins Auxiliary/vim/indent/cmake.vim |
| 224 |
- |
| 225 |
- insinto /usr/share/vim/vimfiles/ftdetect |
| 226 |
- doins "${FILESDIR}/${PN}.vim" |
| 227 |
- |
| 228 |
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
| 229 |
-} |
| 230 |
- |
| 231 |
-pkg_postinst() { |
| 232 |
- use emacs && elisp-site-regen |
| 233 |
- if use qt5; then |
| 234 |
- xdg_icon_cache_update |
| 235 |
- xdg_desktop_database_update |
| 236 |
- xdg_mimeinfo_database_update |
| 237 |
- fi |
| 238 |
-} |
| 239 |
- |
| 240 |
-pkg_postrm() { |
| 241 |
- use emacs && elisp-site-regen |
| 242 |
- if use qt5; then |
| 243 |
- xdg_icon_cache_update |
| 244 |
- xdg_desktop_database_update |
| 245 |
- xdg_mimeinfo_database_update |
| 246 |
- fi |
| 247 |
-} |
| 248 |
|
| 249 |
diff --git a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch |
| 250 |
deleted file mode 100644 |
| 251 |
index 1f3599bcc82..00000000000 |
| 252 |
--- a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch |
| 253 |
+++ /dev/null |
| 254 |
@@ -1,48 +0,0 @@ |
| 255 |
-Do not detect Xcode and set -isysroot for its SDK, since that messes up |
| 256 |
-our toolchain, and hence makes any compilation fail, bug #445308 |
| 257 |
- |
| 258 |
---- a/Modules/Platform/Darwin-Initialize.cmake |
| 259 |
-+++ b/Modules/Platform/Darwin-Initialize.cmake |
| 260 |
-@@ -1,16 +1,16 @@ |
| 261 |
- # Ask xcode-select where to find /Developer or fall back to ancient location. |
| 262 |
--execute_process(COMMAND xcode-select -print-path |
| 263 |
-- OUTPUT_VARIABLE _stdout |
| 264 |
-- OUTPUT_STRIP_TRAILING_WHITESPACE |
| 265 |
-- ERROR_VARIABLE _stderr |
| 266 |
-- RESULT_VARIABLE _failed) |
| 267 |
--if(NOT _failed AND IS_DIRECTORY ${_stdout}) |
| 268 |
-- set(OSX_DEVELOPER_ROOT ${_stdout}) |
| 269 |
--elseif(IS_DIRECTORY "/Developer") |
| 270 |
-- set(OSX_DEVELOPER_ROOT "/Developer") |
| 271 |
--else() |
| 272 |
-+#execute_process(COMMAND xcode-select -print-path |
| 273 |
-+# OUTPUT_VARIABLE _stdout |
| 274 |
-+# OUTPUT_STRIP_TRAILING_WHITESPACE |
| 275 |
-+# ERROR_VARIABLE _stderr |
| 276 |
-+# RESULT_VARIABLE _failed) |
| 277 |
-+#if(NOT _failed AND IS_DIRECTORY ${_stdout}) |
| 278 |
-+# set(OSX_DEVELOPER_ROOT ${_stdout}) |
| 279 |
-+#elseif(IS_DIRECTORY "/Developer") |
| 280 |
-+# set(OSX_DEVELOPER_ROOT "/Developer") |
| 281 |
-+#else() |
| 282 |
- set(OSX_DEVELOPER_ROOT "") |
| 283 |
--endif() |
| 284 |
-+#endif() |
| 285 |
- |
| 286 |
- execute_process(COMMAND sw_vers -productVersion |
| 287 |
- OUTPUT_VARIABLE CURRENT_OSX_VERSION |
| 288 |
-@@ -91,10 +91,10 @@ |
| 289 |
- # CMAKE_OSX_DEPLOYMENT_TARGET |
| 290 |
- |
| 291 |
- # Set cache variable - end user may change this during ccmake or cmake-gui configure. |
| 292 |
--if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) |
| 293 |
-- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING |
| 294 |
-- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") |
| 295 |
--endif() |
| 296 |
-+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) |
| 297 |
-+# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING |
| 298 |
-+# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") |
| 299 |
-+#endif() |
| 300 |
- |
| 301 |
- #---------------------------------------------------------------------------- |
| 302 |
- # CMAKE_OSX_SYSROOT |
Archives