commit: 994391ae87835f151009ee177fc10fa4332551c7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Apr 17 18:23:20 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 17 18:23:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=994391ae
dev-util/ccache: drop 4.3-r3, 4.4.2 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/ccache/Manifest | 2 - dev-util/ccache/ccache-4.3-r3.ebuild | 91 ------------------------------ dev-util/ccache/ccache-4.4.2.ebuild | 88 ----------------------------- dev-util/ccache/files/ccache-4.3-PWD.patch | 85 ---------------------------- 4 files changed, 266 deletions(-) diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index 29ab5c3c1a3d..ddf19bb26242 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -1,5 +1,3 @@ -DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f -DIST ccache-4.4.2.tar.xz 510260 BLAKE2B f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1 SHA512 afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56 DIST ccache-4.6.tar.xz 526084 BLAKE2B 2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24 SHA512 3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e DIST ccache-4.6.tar.xz.asc 833 BLAKE2B e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71 SHA512 af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c diff --git a/dev-util/ccache/ccache-4.3-r3.ebuild b/dev-util/ccache/ccache-4.3-r3.ebuild deleted file mode 100644 index d49b0b149a99..000000000000 --- a/dev-util/ccache/ccache-4.3-r3.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs - -DESCRIPTION="fast compiler cache" -HOMEPAGE="https://ccache.dev/"; -SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"; - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 -IUSE="+static-c++ test" - -DEPEND="" -RDEPEND="${DEPEND} - app-arch/zstd:0= - dev-util/shadowman - sys-apps/gentoo-functions -" -# 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=" - app-text/asciidoc -" - -RESTRICT="!test? ( test )" - -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.1-avoid-run-user.patch - "${FILESDIR}"/${P}-PWD.patch -) - -src_prepare() { - cmake_src_prepare - - sed \ - -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ - "${FILESDIR}"/ccache-config-3 > ccache-config || die - - # 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 failures. - use static-c++ && append-ldflags -static-libstdc++ -} - -src_configure() { - local mycmakeargs=( - -DUSE_CCACHE=OFF - -DUSE_FASTER_LINKER=OFF - -DZSTD_FROM_INTERNET=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} && ${ROOT:-/} == / ]] ; then - eselect compiler-shadow remove ccache - fi -} - -pkg_postinst() { - if [[ ${ROOT:-/} == / ]]; then - eselect compiler-shadow update ccache - fi -} diff --git a/dev-util/ccache/ccache-4.4.2.ebuild b/dev-util/ccache/ccache-4.4.2.ebuild deleted file mode 100644 index 56532612dfec..000000000000 --- a/dev-util/ccache/ccache-4.4.2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs flag-o-matic - -DESCRIPTION="Fast compiler cache" -HOMEPAGE="https://ccache.dev/"; -SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"; - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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" -# 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 )" - -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.1-avoid-run-user.patch -) - -src_prepare() { - cmake_src_prepare - - sed \ - -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ - "${FILESDIR}"/ccache-config-3 > ccache-config || die - - # 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 failures. - use static-c++ && append-ldflags -static-libstdc++ -} - -src_configure() { - local mycmakeargs=( - -DENABLE_DOCUMENTATION=$(usex doc) - -DENABLE_TESTING=$(usex test) - -DUSE_CCACHE=OFF - -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} && ${ROOT:-/} == / ]] ; then - eselect compiler-shadow remove ccache - fi -} - -pkg_postinst() { - if [[ ${ROOT:-/} == / ]]; then - eselect compiler-shadow update ccache - fi -} diff --git a/dev-util/ccache/files/ccache-4.3-PWD.patch b/dev-util/ccache/files/ccache-4.3-PWD.patch deleted file mode 100644 index 3943dab5bd2e..000000000000 --- a/dev-util/ccache/files/ccache-4.3-PWD.patch +++ /dev/null @@ -1,85 +0,0 @@ -https://github.com/ccache/ccache/commit/2d720aed1843b47aafb2af8bfd15139228545e2b.patch -https://bugs.gentoo.org/751355 - -From 2d720aed1843b47aafb2af8bfd15139228545e2b Mon Sep 17 00:00:00 2001 -From: Joel Rosdahl <[email protected]> -Date: Wed, 16 Jun 2021 18:19:04 +0200 -Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20crash=20on=20relative=20PWD=20v?= - =?UTF-8?q?alue?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Even though PWD “shall represent an absolute pathname of the current -working directory”[1], we shouldn’t crash if a user sets it to a -relative path. - -[1]: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03 - -Fixes #860. ---- - src/Util.cpp | 2 +- - test/run | 1 + - test/suites/basedir.bash | 32 ++++++++++++++++++++++++++++++++ - 3 files changed, 34 insertions(+), 1 deletion(-) - ---- a/src/Util.cpp -+++ b/src/Util.cpp -@@ -617,7 +617,7 @@ get_apparent_cwd(const std::string& actual_cwd) - return actual_cwd; - #else - auto pwd = getenv("PWD"); -- if (!pwd) { -+ if (!pwd || !Util::is_absolute_path(pwd)) { - return actual_cwd; - } - ---- a/test/run -+++ b/test/run -@@ -356,6 +356,7 @@ reset_environment() { - unset TERM - unset XDG_CACHE_HOME - unset XDG_CONFIG_HOME -+ export PWD=$(pwd) - - export CCACHE_DETECT_SHEBANG=1 - export CCACHE_DIR=$ABS_TESTDIR/.ccache ---- a/test/suites/basedir.bash -+++ b/test/suites/basedir.bash -@@ -311,4 +311,36 @@ EOF - expect_stat 'cache miss' 1 - expect_equal_content reference.stderr ccache.stderr - fi -+ -+ # ------------------------------------------------------------------------- -+ TEST "Relative PWD" -+ -+ cd dir1 -+ CCACHE_BASEDIR="$(pwd)" PWD=. $CCACHE_COMPILE -I$(pwd)/include -c src/test.c -+ expect_stat 'cache hit (direct)' 0 -+ expect_stat 'cache hit (preprocessed)' 0 -+ expect_stat 'cache miss' 1 -+ -+ cd ../dir2 -+ CCACHE_BASEDIR="$(pwd)" PWD=. $CCACHE_COMPILE -I$(pwd)/include -c src/test.c -+ expect_stat 'cache hit (direct)' 1 -+ expect_stat 'cache hit (preprocessed)' 0 -+ expect_stat 'cache miss' 1 -+ -+ # ------------------------------------------------------------------------- -+ TEST "Unset PWD" -+ -+ unset PWD -+ -+ cd dir1 -+ CCACHE_BASEDIR="$(pwd)" $CCACHE_COMPILE -I$(pwd)/include -c src/test.c -+ expect_stat 'cache hit (direct)' 0 -+ expect_stat 'cache hit (preprocessed)' 0 -+ expect_stat 'cache miss' 1 -+ -+ cd ../dir2 -+ CCACHE_BASEDIR="$(pwd)" $CCACHE_COMPILE -I$(pwd)/include -c src/test.c -+ expect_stat 'cache hit (direct)' 1 -+ expect_stat 'cache hit (preprocessed)' 0 -+ expect_stat 'cache miss' 1 - }
