diff options
author | Sam James <sam@gentoo.org> | 2023-06-13 19:11:35 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2023-06-13 19:11:58 +0100 |
commit | c53ba48e6c2b55a955ea41aaabe242b880276d5f (patch) | |
tree | e390eec85eb87222f7eabf0139f6cdffcc99eba5 /dev-util/ccache | |
parent | dev-libs/weston: Stabilize 11.0.1 ppc64, #905606 (diff) | |
download | gentoo-c53ba48e6c2b55a955ea41aaabe242b880276d5f.tar.gz gentoo-c53ba48e6c2b55a955ea41aaabe242b880276d5f.tar.bz2 gentoo-c53ba48e6c2b55a955ea41aaabe242b880276d5f.zip |
dev-util/ccache: drop 4.6.3
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/ccache')
-rw-r--r-- | dev-util/ccache/Manifest | 2 | ||||
-rw-r--r-- | dev-util/ccache/ccache-4.6.3.ebuild | 93 | ||||
-rw-r--r-- | dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch | 30 |
3 files changed, 0 insertions, 125 deletions
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index c458a2ad7b68..e230e1cec10a 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -1,5 +1,3 @@ -DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9 SHA512 b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966 -DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89 DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f SHA512 48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908 SHA512 567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9 SHA512 e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb diff --git a/dev-util/ccache/ccache-4.6.3.ebuild b/dev-util/ccache/ccache-4.6.3.ebuild deleted file mode 100644 index 269b9595497c..000000000000 --- a/dev-util/ccache/ccache-4.6.3.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc -inherit cmake toolchain-funcs flag-o-matic 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 )" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 -IUSE="doc redis +static-c++ test" -RESTRICT="!test? ( test )" - -DEPEND="app-arch/zstd:= - redis? ( dev-libs/hiredis:= )" -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. -DEPEND+=" test? ( dev-libs/elfutils )" -BDEPEND=" doc? ( dev-ruby/asciidoctor ) - 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.6.2-avoid-run-user.patch -) - -src_prepare() { - cmake_src_prepare - - sed \ - -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ - "${FILESDIR}"/ccache-config-3 > ccache-config || die -} - -src_configure() { - # Mainly used in tests - tc-export CC OBJDUMP - - # 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. - use static-c++ && append-ldflags -static-libstdc++ - - local mycmakeargs=( - -DENABLE_DOCUMENTATION=$(usex doc) - -DENABLE_TESTING=$(usex test) - -DZSTD_FROM_INTERNET=OFF - -DREDIS_STORAGE_BACKEND=$(usex redis) - ) - - use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - dobin ccache-config - insinto /usr/share/shadowman/tools - newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" -} - -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.6.2-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch deleted file mode 100644 index ff579ca7fdb6..000000000000 --- a/dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch +++ /dev/null @@ -1,30 +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. ---- a/src/Config.cpp -+++ b/src/Config.cpp -@@ -1039,14 +1039,5 @@ Config::check_key_tables_consistency() - std::string - Config::default_temporary_dir() const - { -- static const std::string run_user_tmp_dir = [] { --#ifdef HAVE_GETEUID -- auto dir = FMT("/run/user/{}/ccache-tmp", geteuid()); -- if (Util::create_dir(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"; - } |