From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-build/cmake/
Date: Fri, 07 Mar 2025 05:28:27 +0000 (UTC) [thread overview]
Message-ID: <1741325268.20bf4f47aa74e82e7a3b88b6561de1bded5be300.sam@gentoo> (raw)
commit: 20bf4f47aa74e82e7a3b88b6561de1bded5be300
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 7 05:27:48 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 7 05:27:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20bf4f47
dev-build/cmake: add 4.0.0_rc3
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/cmake/Manifest | 1 +
dev-build/cmake/cmake-4.0.0_rc3.ebuild | 319 +++++++++++++++++++++++++++++++++
2 files changed, 320 insertions(+)
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index ac36fd154684..1a771567c859 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -14,4 +14,5 @@ DIST cmake-3.31.6-SHA-256.txt 1646 BLAKE2B f5d3bb67759b4b227bd38eb7de8405052fd55
DIST cmake-3.31.6-SHA-256.txt.asc 833 BLAKE2B a99307a7e8011a1df30a2f364ae68b2f5d286d0d98f8a9b5d27283aa109963d6989218a8b3787666d7aa3a7e37e4d6468077c16b6550727efd1295f8c0504caa SHA512 c7a728110790a85ba89dace68c9bd4c22c81ae4482a758297fdb49e7eb11ccf0056d0d4fcf100be71eed7cc2ae3f633722df801dba2d61dd0fafb476d5b09128
DIST cmake-3.31.6.tar.gz 11710589 BLAKE2B ea1bee1a98568407dfc164f82bf0e3ab082124bbbb12cfa18489bdbe9964418ee30fb62b4915bc06645bcd2cf1e17bfb9c210812da070acbba848db186d06044 SHA512 839d06b6ebd0bf78cbe8f7ae3a7c00026e70d759a81ac51aa103f35ad985ac69be9e667aae7b5fe48c5e0c41baec791259279679dbdf2ddd8b63a48382a8a2a0
DIST cmake-4.0.0-rc1.tar.gz 11822440 BLAKE2B 644177b912908bf54861aae9b01c14512ab02a99a7699e95dd775d9661abff556400dbedd841258211baf86bef68271e019052470a13d06ce8392104eab245a8 SHA512 7b08a425907e5eef820ca4db8732825bbd7880ac8a4566c103b9ebfe8d3407aa048213e2c4bd685c5f728d5aa975f4a46fc4f76509b7484a0e9cd604e2b81973
+DIST cmake-4.0.0-rc3.tar.gz 11824249 BLAKE2B 1fa96d5e5703e7261edd6b7305b6752d2d1aebfe55ee7dba718969979d3b1c45a2bfed67fdc45001d42a6afc5eab8c22faca88dc3231b40ffb93ab555a5cb6c9 SHA512 69814a171a5210b8d54e5c1e80e713b5f208f90e145eeaada1be8508c209a660e4cad03aa0b174b17844e922288a9490dddca164e99409e37821e5ab3b5c4dee
DIST cmake-4.0.0_rc1-docs.tar.xz 577536 BLAKE2B 74a742ffef8e1af1652746e1c177d4198155145a039635e6a0ea40af463f3a2d45b6c6ce7d3a9b1fee24f0c1cfd1c3aa95c27669ca3c6281d54e701fc0ece202 SHA512 74c20067d3b82493024b2f2711b55b93998ce3b5f35ab5a154f33a8268a35a29d01127c55ce6b85b80ff252d15284ed1065e1338422124f6722a4190a984637c
diff --git a/dev-build/cmake/cmake-4.0.0_rc3.ebuild b/dev-build/cmake/cmake-4.0.0_rc3.ebuild
new file mode 100644
index 000000000000..9f2461698f96
--- /dev/null
+++ b/dev-build/cmake/cmake-4.0.0_rc3.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+CMAKE_DOCS_VERSION=4.0.0_rc1
+#CMAKE_DOCS_VERSION=${PV}
+#CMAKE_DOCS_VERSION=$(ver_cut 1-2).0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake flag-o-matic multiprocessing \
+ toolchain-funcs xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == *9999* ]] ; then
+ CMAKE_DOCS_PREBUILT=0
+
+ EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+ inherit git-r3
+else
+ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+ if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+ SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+ fi
+
+ if [[ ${PV} != *_rc* ]] ; then
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
+ inherit verify-sig
+
+ SRC_URI+=" verify-sig? (
+ https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+ https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+ )"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+ BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )"
+ fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-arch/libarchive-3.3.3:=
+ app-crypt/rhash:0=
+ >=dev-libs/expat-2.0.1
+ >=dev-libs/jsoncpp-1.9.2-r2:0=
+ >=dev-libs/libuv-1.10.0:=
+ >=net-misc/curl-7.21.5[ssl]
+ sys-libs/zlib
+ virtual/pkgconfig
+ dap? ( dev-cpp/cppdap )
+ gui? ( dev-qt/qtbase:6[gui,widgets] )
+ ncurses? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+ doc? (
+ dev-python/requests
+ dev-python/sphinx
+ )
+ test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+ # Prefix
+ "${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
+ "${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
+ # Misc
+ "${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
+ "${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
+ "${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
+ # Cuda
+ "${FILESDIR}/${PN}-3.30.3-cudahostld.patch"
+
+ # Upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+ # disable running of cmake in bootstrap command
+ sed -i \
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+ bootstrap || die "sed failed"
+
+ # execinfo.h on Solaris isn't quite what it is on Darwin
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ sed -i -e 's/execinfo\.h/blablabla.h/' \
+ Source/kwsys/CMakeLists.txt || die
+ fi
+
+ # bootstrap script isn't exactly /bin/sh compatible
+ tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+ --prefix="${T}/cmakestrap/" \
+ --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+ || die "Bootstrap failed"
+}
+
+pkg_pretend() {
+ if [[ -z ${EPREFIX} ]] ; then
+ local file
+ local errant_files=()
+
+ # See bug #599684 and bug #753581 (at least)
+ for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
+ if [[ -e ${file} ]]; then
+ errant_files+=( "${file}" )
+ fi
+ done
+
+ # If errant files exist
+ if [[ ${#errant_files[@]} -gt 0 ]]; then
+ eerror "Errant files found!"
+ eerror "The presence of these files is known to confuse CMake's"
+ eerror "library path logic. Please (re)move these files:"
+
+ for file in "${errant_files[@]}"; do
+ eerror " mv ${file} ${file}.bak"
+ done
+
+ die "Stray files found in /etc/, see above message"
+ fi
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+ elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
+ default
+ else
+ cd "${DISTDIR}" || die
+
+ # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+ verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+ verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+ cd "${WORKDIR}" || die
+
+ default
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # Disable Xcode hooks, bug #652134
+ sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+ Source/CMakeLists.txt || die
+ sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+ -e '/cmGlobalXCodeGenerator.h/d' \
+ Source/cmake.cxx || die
+ # Disable system integration, bug #933744
+ sed -i -e 's/__APPLE__/__DISABLED__/' \
+ Source/cmFindProgramCommand.cxx \
+ Source/CPack/cmCPackGeneratorFactory.cxx || die
+ sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \
+ Source/cmMachO.cxx || die
+ sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \
+ Source/CMakeLists.txt || die
+
+ # Disable isysroot usage with GCC, we've properly instructed
+ # where things are via GCC configuration and ldwrapper
+ sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+ Modules/Platform/Apple-GNU-*.cmake || die
+ # Disable isysroot usage with clang as well
+ sed -i -e '/_SYSROOT_FLAG/d' \
+ Modules/Platform/Apple-Clang.cmake || die
+ # Don't set a POSIX standard, system headers don't like that, #757426
+ sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+ Source/cmLoadCommandCommand.cxx \
+ Source/cmStandardLexer.h \
+ Source/cmSystemTools.cxx \
+ Source/cmTimestamp.cxx
+ sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+ Source/cmStandardLexer.h
+ fi
+
+ # Add gcc libs to the default link paths
+ sed -i \
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+ -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+ ## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must*
+ ## handle them as part of bootstrapping, sadly.
+
+ # Fix linking on Solaris
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+ # ODR warnings, bug #858335
+ # https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+ filter-lto
+
+ # 4.0.0_rc1 is missing this, fails to configure
+ # https://gitlab.kitware.com/cmake/cmake/-/issues/26712
+ touch .clang-tidy Utilities/.clang-tidy || die
+
+ if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+ CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+ cmake_src_bootstrap
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMake_ENABLE_DEBUGGER=$(usex dap)
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ -DSPHINX_MAN=$(usex doc)
+ -DSPHINX_HTML=$(usex doc)
+ -DBUILD_CursesDialog="$(usex ncurses)"
+ -DBUILD_TESTING=$(usex test)
+ -DBUILD_QtDialog=$(usex gui)
+ )
+
+ use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 )
+
+ cmake_src_configure
+}
+
+src_test() {
+ # Fix OutDir and SelectLibraryConfigurations tests
+ # these are altered thanks to our eclass
+ sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+ || die
+
+ unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+
+ # Excluded tests:
+ # BootstrapTest: we actually bootstrap it every time so why test it?
+ # BundleUtilities: bundle creation broken
+ # CMakeOnly.AllFindModules: pthread issues
+ # CTest.updatecvs: which fails to commit as root
+ # Fortran: requires fortran
+ # RunCMake.CompilerLauncher: also requires fortran
+ # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+ # debugedit binary is not in the expected location
+ # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+ # it can't find a deb package that owns libc
+ # TestUpload, which requires network access
+ # RunCMake.CMP0125, known failure reported upstream (bug #829414)
+ local myctestargs=(
+ --output-on-failure
+ -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+ )
+
+ local -x QT_QPA_PLATFORM=offscreen
+
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ # If USE=doc, there'll be newly generated docs which we install instead.
+ if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+ doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+ fi
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Auxiliary/vim/syntax/cmake.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Auxiliary/vim/indent/cmake.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${PN}.vim"
+
+ dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+ if use gui; then
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
+}
+
+pkg_postrm() {
+ if use gui; then
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
+}
next reply other threads:[~2025-03-07 5:28 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-07 5:28 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-09 20:19 [gentoo-commits] repo/gentoo:master commit in: dev-build/cmake/ Sam James
2025-02-28 8:19 Andreas Sturmlechner
2025-02-25 6:58 Sam James
2025-02-20 8:12 Arthur Zamarin
2025-02-20 8:05 Sam James
2025-02-19 22:21 Sam James
2025-02-19 22:21 Sam James
2025-02-19 22:21 Sam James
2025-02-19 21:26 Sam James
2025-02-19 21:26 Sam James
2025-01-24 11:57 Sam James
2025-01-19 18:28 Arthur Zamarin
2025-01-12 22:48 Andreas Sturmlechner
2025-01-12 22:48 Andreas Sturmlechner
2025-01-10 21:36 Sam James
2025-01-03 2:40 Sam James
2024-12-31 9:08 Andreas Sturmlechner
2024-12-20 4:18 Sam James
2024-12-18 22:38 Sam James
2024-12-18 22:38 Sam James
2024-12-18 22:38 Sam James
2024-12-14 17:34 Sam James
2024-12-10 5:55 Sam James
2024-12-06 17:31 Sam James
2024-12-06 17:31 Sam James
2024-12-01 17:35 Jakov Smolić
2024-12-01 11:05 Sam James
2024-12-01 10:42 Sam James
2024-12-01 10:42 Sam James
2024-12-01 10:42 Sam James
2024-12-01 10:17 Sam James
2024-12-01 10:16 Sam James
2024-11-22 18:10 Sam James
2024-11-22 18:10 Sam James
2024-11-08 16:34 Sam James
2024-11-03 21:11 Andreas Sturmlechner
2024-10-30 17:27 Arthur Zamarin
2024-10-24 7:43 Arthur Zamarin
2024-10-21 18:41 Arthur Zamarin
2024-10-21 18:41 Arthur Zamarin
2024-10-21 12:48 Sam James
2024-10-21 12:31 Sam James
2024-10-21 12:15 Sam James
2024-10-08 19:47 Sam James
2024-10-08 19:32 Sam James
2024-09-30 14:06 Sam James
2024-09-11 17:45 Arthur Zamarin
2024-09-07 14:27 Sam James
2024-09-07 14:27 Sam James
2024-09-02 7:29 Arthur Zamarin
2024-08-29 3:51 Sam James
2024-08-29 3:15 Sam James
2024-08-06 7:28 Sam James
2024-07-19 4:55 Sam James
2024-07-19 4:55 Sam James
2024-07-18 19:15 Fabian Groffen
2024-07-07 7:10 Eli Schwartz
2024-07-03 2:33 Sam James
2024-07-03 2:10 Sam James
2024-07-03 1:47 Sam James
2024-06-24 20:15 Andreas Sturmlechner
2024-06-01 3:56 Sam James
2024-06-01 3:46 Ionen Wolkens
2024-05-11 10:22 Arthur Zamarin
2024-05-11 7:23 Arthur Zamarin
2024-05-11 3:04 Sam James
2024-05-11 2:36 Sam James
2024-05-11 2:36 Sam James
2024-05-11 2:36 Sam James
2024-05-11 2:17 Sam James
2024-05-11 2:17 Sam James
2024-05-07 23:04 Sam James
2024-05-07 23:04 Sam James
2024-04-12 14:15 Sam James
2024-04-08 12:19 Sam James
2024-03-22 5:05 Sam James
2024-03-22 4:51 Sam James
2024-03-17 0:14 Sam James
2024-03-16 17:34 Arthur Zamarin
2024-03-16 16:56 Arthur Zamarin
2024-03-16 16:54 Arthur Zamarin
2024-03-16 16:45 Arthur Zamarin
2024-03-16 16:45 Arthur Zamarin
2024-03-16 16:42 Arthur Zamarin
2024-02-22 4:45 Ionen Wolkens
2024-02-06 3:26 Sam James
2024-01-31 20:35 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1741325268.20bf4f47aa74e82e7a3b88b6561de1bded5be300.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox