commit: 18c9da1695d7d77735c4f3134557caf54b6f7778 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Mar 6 01:21:09 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Mar 6 01:21:09 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c9da16
dev-util/ccache: add 4.13 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/ccache/Manifest | 3 + dev-util/ccache/ccache-4.13.ebuild | 148 +++++++++++++++++++++ .../ccache/files/ccache-4.13-avoid-run-user.patch | 25 ++++ 3 files changed, 176 insertions(+) diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index 7d76acec0cae..6b7c898aae75 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -4,3 +4,6 @@ DIST ccache-4.11.3.tar.xz.asc 833 BLAKE2B ee4a4abac6268ef38ef4c5e131ba76fbd11ae7 DIST ccache-4.12-docs.tar.xz 85640 BLAKE2B 6e554be1d6bfc583fa92b29c891a3c55fb0abd943c467a5b03d984300093362fd2a5ad6b78c03f0b14fbd16df9f1b2433b786270b0f6f9f9bb45a10943007b93 SHA512 373399313fa8465ec66d2c73e3a39def52eec18a9f925af9afdf998045edb02bad2502b50bcbae22c532a4f19835cdfcbf89770f8e7610031968524505d2c1d6 DIST ccache-4.12.3.tar.xz 511356 BLAKE2B f15d68b7f3fc457b967c76ee068c1f16cd5e210aa51b56d9672d43df0c7faf8e07cecb987cf0c13228e764431f170068d2f422f0f213ec66bd7a19f7adf4b594 SHA512 6745a6dc002e8cca802d2559993d88028fc138d25a079efbc7bb6d4b39e09b2f46eeb1c5aa857f34fc45b7e8f9cfa6764b412b0e96c7f12225083a29c0cde314 DIST ccache-4.12.3.tar.xz.minisig 315 BLAKE2B a087a330e15567ee16541cd92df9defbb477e459407dfe78b642cfbf4bbb9741c91b32951f9cea0423a387ad487710747d5ba6e3bcf10f1523c5301ab3c37f85 SHA512 0c2334642f8ac15093b6838f9cea881960acb175e5418f1e8f54f11a8a3ace3784daf1489e7adff29198bc46704ac62db13a8d4f29e2c66cdc52383ccbe3e2da +DIST ccache-4.13-docs.tar.xz 89264 BLAKE2B 7d59c28dd68a28d3ca4393a5aaa0c3ed6ee839178f7b7ad19eea1d7ea9cf527156ca3bdb39c20fad43691b43fb375ad890020abc30a96aa2d1d39d16f8f2d314 SHA512 4953ad7862adb5ffd5951e226345006e3c928789d30f65754e9af74743ef334f4b83b3b028ebfb00445d28aac96a0c4823aabf634e47df0e44f674e58d383135 +DIST ccache-4.13.tar.xz 533424 BLAKE2B 4246b8d18f569392916affabaf55f65424a4aaee1a8c340e9e87978af4616700184e2296a2dec53dfcc0073c33daa2a5fa1209c486ab3bec6f5a3389bf19d695 SHA512 35f75b389b6de5e313036d25fc5c3e443da006aaefbbb791f2d144a8a087f92c17a4541ea1b2e2943c964da9ee0bd58957e17af25e9d575cb22c55d6df7dd5e1 +DIST ccache-4.13.tar.xz.minisig 313 BLAKE2B 1f343045dbc313ee80caf4ec62299cd32f8c25e0939dc21926cf1f14f87fde279fab3f049b105cb461912f08dc2af00697101f4384526f8027d419179f2d9ecb SHA512 f51cc6da4893f4361065ed8fb93944dba411ffc2051fe04a211ad1ecdcf4e41ef7c0be568aa3395ff1c5bb068061c3592851989bc8ecd7f33ec6ebda896d43c4 diff --git a/dev-util/ccache/ccache-4.13.ebuild b/dev-util/ccache/ccache-4.13.ebuild new file mode 100644 index 000000000000..de7fd34d08e4 --- /dev/null +++ b/dev-util/ccache/ccache-4.13.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu +# because Portage unsets them. Aaaah! +# +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +: ${MY_DOCS_PREBUILT:=1} + +MY_DOCS_PREBUILT_DEV=sam +MY_DOCS_VERSION=$(ver_cut 1-2) +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# See bug #784815 +MY_DOCS_USEFLAG="+doc" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ccache.minisig +VERIFY_SIG_METHOD=minisig +inherit cmake toolchain-funcs flag-o-matic prefix verify-sig + +DESCRIPTION="Fast compiler cache" +HOMEPAGE="https://ccache.dev/"; +SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"; +SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.minisig )" +if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )" + MY_DOCS_USEFLAG="doc" +fi + +# https://ccache.dev/license.html +# ccache, blake3 +LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 )" +LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 +IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test" +RESTRICT="!test? ( test )" + +DEPEND=" + >=app-arch/zstd-1.3.4:= + !static-c++? ( + >=dev-cpp/cpp-httplib-0.20.0:= + >=dev-libs/libfmt-8.0.0:= + ) + >=dev-libs/blake3-1.8.2:= + >=dev-libs/xxhash-0.8.3 + redis? ( >=dev-libs/hiredis-1.3.0:= ) +" +RDEPEND=" + ${DEPEND} + dev-util/shadowman + sys-apps/gentoo-functions +" +DEPEND+=" dev-cpp/expected" +# Needed for eselect calls in pkg_* +IDEPEND="dev-util/shadowman" + +# clang-specific tests use dev-libs/elfutils to compare objects for equality. +# Let's pull in the dependency unconditionally. +BDEPEND=" + doc? ( dev-ruby/asciidoctor ) + test? ( + >=dev-cpp/doctest-2.4.12 + dev-libs/elfutils + ) + verify-sig? ( sec-keys/minisig-keys-ccache ) +" + +DOCS=( doc/{authors,manual,news}.adoc CONTRIBUTING.md README.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-nvcc-test.patch + "${FILESDIR}"/${PN}-4.0-objdump.patch + "${FILESDIR}"/${PN}-4.13-avoid-run-user.patch +) + +src_unpack() { + # Avoid aborting on the doc tarball + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.minisig} + fi + + default +} + +src_prepare() { + cmake_src_prepare + + cp "${FILESDIR}"/ccache-config-3 ccache-config || die + eprefixify ccache-config +} + +src_configure() { + # Mainly used in tests + tc-export CC OBJDUMP + + local mycmakeargs=( + -DENABLE_DOCUMENTATION=$(usex doc) + -DENABLE_TESTING=$(usex test) + -DDEPS=LOCAL + -DREDIS_STORAGE_BACKEND=$(usex redis) + ) + + # Avoid dependency on libstdc++.so. Useful for cases when + # we would like to use ccache to build older gcc which injects + # into ccache locally built (possibly outdated) libstdc++ + # See bug #761220 for examples. + # + # Ideally gcc should not use LD_PRELOAD to avoid this type of failure. + if use static-c++ ; then + append-ldflags -static-libstdc++ + mycmakeargs+=( + -DDEP_CPPHTTPLIB=BUNDLED + -DDEP_FMT=BUNDLED + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + dobin ccache-config + insinto /usr/share/shadowman/tools + newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" + + # If USE=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8] + fi +} + +pkg_prerm() { + if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then + eselect compiler-shadow remove ccache + fi +} + +pkg_postinst() { + if [[ -z ${ROOT} ]] ; then + eselect compiler-shadow update ccache + fi +} diff --git a/dev-util/ccache/files/ccache-4.13-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.13-avoid-run-user.patch new file mode 100644 index 000000000000..eeaf20b6eb59 --- /dev/null +++ b/dev-util/ccache/files/ccache-4.13-avoid-run-user.patch @@ -0,0 +1,25 @@ +Gentoo's sandbox does not whitelist this path by default yet. + +(4.1 update: +https://github.com/ccache/ccache/issues/984 +https://github.com/ccache/ccache/issues/1044 +https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1 +https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68 +... gets us closer, but not there yet.) + +And see https://github.com/ccache/ccache/discussions/1086#discussioncomment-3327565. + +https://bugs.gentoo.org/837362 for 4.6 issue. +https://bugs.gentoo.org/883799 and https://bugs.gentoo.org/887019 for 4.8 issue. +--- a/src/ccache/config.cpp ++++ b/src/ccache/config.cpp +@@ -1505,8 +1505,7 @@ Config::check_key_tables_consistency() + fs::path + Config::default_temporary_dir() const + { +- const auto dir = get_xdg_runtime_tmp_dir(); +- return !dir.empty() ? dir : m_cache_dir / "tmp"; ++ return m_cache_dir / "tmp"; + } + + std::filesystem::path
