commit: ec89a38a069a79324c56c40a5a40df323ec417d0 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Nov 13 07:59:37 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Nov 13 07:59:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec89a38a
dev-util/ccache: drop 4.10.2-r1, 4.11.2, 4.12 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/ccache/Manifest | 7 - dev-util/ccache/ccache-4.10.2-r1.ebuild | 147 -------------------- dev-util/ccache/ccache-4.11.2.ebuild | 147 -------------------- dev-util/ccache/ccache-4.12.ebuild | 149 --------------------- .../ccache/files/ccache-4.10-avoid-run-user.patch | 34 ----- 5 files changed, 484 deletions(-) diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index f4af7943c0ba..4ff0ed1d5d13 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -1,13 +1,6 @@ -DIST ccache-4.10-docs.tar.xz 82900 BLAKE2B 0d0ef988bb21bc05642c2d5ea42bdf9c87c190464d3bddc08a8bf281b003670a50a07a88bf31731a781d5454be09b87168bc8df3b239b93f4e3d3e3f667e9094 SHA512 c1030e76dea6eaeed5548dda80a766bb9c944f8e1223157eb7a227f08f80f48a8fece4e1a99beced4c6075b40ec7de3df662111c95f9390624f6e9a3b04c1083 -DIST ccache-4.10.2.tar.xz 485460 BLAKE2B 7352b8b48ed889e1f251ae59cb7cd9d01d7d3226b58a7823be176907dc074ff22ca5d6a271e2caede7d97a65457b9067b48e9d39ab833bf45fb055eb3bfe7607 SHA512 3815c71d7266c32839acb306763268018acc58b3bbbd9ec79fc101e4217c1720d2ad2f01645bf69168c1c61d27700b6f3bb755cfa82689cca69824f015653f3c -DIST ccache-4.10.2.tar.xz.asc 833 BLAKE2B 4a975aa1e8c9c12cf4df60b31cea10023e8e8efb561608dd652ecef2a0e575b41c5f6cfc551b0f3bd860e3b4a59061fcf870a67f5625f6a82cab104045ac2e57 SHA512 4afcc08563f0dfc8ccfd0797ea2cc26227b253415b9b9fe8ed90ef47e5b8d1dbcb8cbdd17ebf95acd6a367260f6a405764d0d0c5432cfbe2dce4d098b2a7a1b9 DIST ccache-4.11-docs.tar.xz 86044 BLAKE2B c357dc3aa328a8201e62dfd92dc9380b2d5bbaf613a390305021a67f84199688e6fd6fb20489ad4ad81c45bbde44c8133fd12dc5f33cd7925fbde795fe5927e0 SHA512 58ffb519f24e33ac4394ce8dd5667ed1be67cab60ebcab7aa3c82adb31f14110992d0e56f8ebf2ef87e43bcfa202e1c05a4a187b5bcfc39a9bf0525d7039a0ce -DIST ccache-4.11.2.tar.xz 500800 BLAKE2B 4536cc3089cb8267fe4c01d3f4f6ffe962cec39d498b962d535a347bfbe1dda5e69652deb86e3e302667d1b51ea60e59a5c72c1acf55466174d0459b640167b7 SHA512 6c0f1243097ee93e7d73d5bdcd4609f771fd19e4b52afc5f9b813663b7d195ec503efb990c3b5205d8e9fa6dd16f78c031d93d5cff47223e6d4c1986ac1d6315 -DIST ccache-4.11.2.tar.xz.asc 833 BLAKE2B 194770651e233604848a74a724d45ec29988980e28f2e956422e362909abee27b1dc689e104e12d806590b4da2f967bac5f62405c305e970eebed9a212b69f33 SHA512 9471f88497f53a9bbafc907c502f62c8ea9adc08030e6c2dbf7f04d67478f3e3763fdf12f647a13ca5c6dbf0c7e0ba9c0fb5c05a7df4f54b7f44b8e41d1f79c6 DIST ccache-4.11.3.tar.xz 500700 BLAKE2B 62c3cd1fc5ef620211b99f2df4e55985c209f24f6f6dfd8fcbd1d0bb4b7b0e29fe3057561314bc62b74d0560e368c9e93e1aaed158c6d6a4f2103aba8c938be4 SHA512 0707d140cc9965144aa9de4b51132dfc87204ff16d907925cff30974fc830731931dbaf17e23e3366d1f5d6ddea8884c06a0f059a4ce460b3a9f87121419398f DIST ccache-4.11.3.tar.xz.asc 833 BLAKE2B ee4a4abac6268ef38ef4c5e131ba76fbd11ae73a858362b4a4da58d20ae39dc4f5c8b20c7dc54227018c2122ee9ae3ef402282669962947f306373226e0df6a6 SHA512 e689bf1882d587f9383e73d9a198793812854c1c3059f569a2d986e90405d52c8f2d6edbdc34c9263433bfb78ff82a219c75ed2b3fdabee2dea379ed2a86d54d DIST ccache-4.12-docs.tar.xz 85640 BLAKE2B 6e554be1d6bfc583fa92b29c891a3c55fb0abd943c467a5b03d984300093362fd2a5ad6b78c03f0b14fbd16df9f1b2433b786270b0f6f9f9bb45a10943007b93 SHA512 373399313fa8465ec66d2c73e3a39def52eec18a9f925af9afdf998045edb02bad2502b50bcbae22c532a4f19835cdfcbf89770f8e7610031968524505d2c1d6 DIST ccache-4.12.1.tar.xz 509872 BLAKE2B 1ff3ddede9f60471cbfaede36722b399f45c4f33f7012db31e2f806db63ffccf1985681d414a91d391391efcd10453f0be666afbbf0c5cafad70b487ab5fd504 SHA512 f6618026b99d7352fc59d8233dd1cb307970baceb37b3c0c8f5360ca485141ca12da5bcf1e58deaa9e2c383cf40b56eb6fae70a51db90f54ae126596e841eb57 DIST ccache-4.12.1.tar.xz.minisig 315 BLAKE2B a8f97d4ec3ead39d8a49e737d1bf36c9f65b9255846f76a35d09450f88026dc4aabd520f704da44f8453812c557d85ded944b7599e2da2a4e3ba1e4f523c8521 SHA512 c66612a70ffeaf29f04d0109d4171d0baf3de0b4b456e968942efc9be644e5e7a74ad0f9597d1f4bf8390a74e9f9f8ce456ec52e95d35411fa689fed28af2d4a -DIST ccache-4.12.tar.xz 509472 BLAKE2B 91292a9c6978d6bd5a22d10bdfe14ce2f105d2a19d9c6921a7b6b230aa477786483e0e4f0de98f4bcf25cb2fe64899a2cf9c8bf0f8957814af5bb6c40cc7d1ac SHA512 c7b9516dd11507f603b27dc0c23c3c21f133a23cad2e4f4eb3b0405f055034ea85e9728015bff295312c3c86bcfa54efcedc513615b4284c2b1ba8ca5bdb3ff2 -DIST ccache-4.12.tar.xz.minisig 313 BLAKE2B ce5541b9d2f34b644b03121129ed9812064c910b403b05495d552031090a6cc807d4f6bcd4edc53604c60296b4e411c6909479c44062f1638afe5fc84baf978a SHA512 4e1e12b49b88881f8ba44795631d8598dedfcf0ac0c72d4ff4d27d87f649a1689c15ea43a52912c226e384ae35268a68feed90ce70abe29feb29c8a71a376713 diff --git a/dev-util/ccache/ccache-4.10.2-r1.ebuild b/dev-util/ccache/ccache-4.10.2-r1.ebuild deleted file mode 100644 index 1f3ed87f2286..000000000000 --- a/dev-util/ccache/ccache-4.10.2-r1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2025 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/joelrosdahl.asc -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.asc )" -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, NonstdSpan, tl-expected -LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0" -LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc 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 )" - -# TODO: package NonstdSpan, TlExpected -DEPEND=" - >=app-arch/zstd-1.3.4:= - !static-c++? ( - >=dev-cpp/cpp-httplib-0.10.6:= - >=dev-libs/libfmt-8.0.0:= - ) - >=dev-libs/blake3-1.4.0:= - >=dev-libs/xxhash-0.8.0 - redis? ( >=dev-libs/hiredis-0.13.3:= ) -" -RDEPEND=" - ${DEPEND} - dev-util/shadowman - sys-apps/gentoo-functions -" -# 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.6 - dev-libs/elfutils - ) - verify-sig? ( sec-keys/openpgp-keys-joelrosdahl ) -" - -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.10-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{,.asc} - 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/ccache-4.11.2.ebuild b/dev-util/ccache/ccache-4.11.2.ebuild deleted file mode 100644 index 53a111a563e2..000000000000 --- a/dev-util/ccache/ccache-4.11.2.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2025 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/joelrosdahl.asc -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.asc )" -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, NonstdSpan, tl-expected -LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0" -LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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 )" - -# TODO: package NonstdSpan, TlExpected -DEPEND=" - >=app-arch/zstd-1.3.4:= - !static-c++? ( - >=dev-cpp/cpp-httplib-0.10.6:= - >=dev-libs/libfmt-8.0.0:= - ) - >=dev-libs/blake3-1.4.0:= - >=dev-libs/xxhash-0.8.3 - redis? ( >=dev-libs/hiredis-0.13.3:= ) -" -RDEPEND=" - ${DEPEND} - dev-util/shadowman - sys-apps/gentoo-functions -" -# 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.6 - dev-libs/elfutils - ) - verify-sig? ( sec-keys/openpgp-keys-joelrosdahl ) -" - -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.11-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{,.asc} - 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/ccache-4.12.ebuild b/dev-util/ccache/ccache-4.12.ebuild deleted file mode 100644 index 84efe5730e46..000000000000 --- a/dev-util/ccache/ccache-4.12.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2025 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, NonstdSpan, tl-expected -LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0" -LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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 )" - -# TODO: package NonstdSpan, TlExpected -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 -" -# 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.11-avoid-run-user.patch - "${FILESDIR}"/${PN}-4.11.3-libfmt-libcxx-21.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.10-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.10-avoid-run-user.patch deleted file mode 100644 index d60cc365f25d..000000000000 --- a/dev-util/ccache/files/ccache-4.10-avoid-run-user.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 fo 4.8 issue. ---- a/src/ccache/Config.cpp -+++ b/src/ccache/Config.cpp -@@ -1193,17 +1193,5 @@ Config::check_key_tables_consistency() - std::string - Config::default_temporary_dir() const - { -- static const std::string run_user_tmp_dir = [] { --#ifndef _WIN32 -- const char* const xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"); -- if (xdg_runtime_dir && DirEntry(xdg_runtime_dir).is_directory()) { -- auto dir = FMT("{}/ccache-tmp", xdg_runtime_dir); -- if (fs::create_directories(dir) && access(dir.c_str(), W_OK) == 0) { -- return dir; -- } -- } --#endif -- return std::string(); -- }(); -- return !run_user_tmp_dir.empty() ? run_user_tmp_dir : m_cache_dir + "/tmp"; -+ return m_cache_dir + "/tmp"; - }
