[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/, dev-util/ccache/

["Sam James" <sam@gentoo.org>]

commit:     65c91a401281c8b9c2145f79a47798812db97666
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 07:31:44 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 07:32:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c91a40

dev-util/ccache: add 4.9

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/ccache/Manifest                           |   3 +
 dev-util/ccache/ccache-4.9.ebuild                  | 132 +++++++++++++++++++++
 .../ccache/files/ccache-4.9-avoid-run-user.patch   |  34 ++++++
 3 files changed, 169 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 904ac1d142c5..c19c5dff0974 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,3 +1,6 @@
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9 SHA512 e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
 DIST ccache-4.8.3.tar.xz 569724 BLAKE2B 53211db0e516eea9739b8f05bf6a3db678b4b5cff7af741469360556da20a320e4a40253ca9e51568045a394d3497b428413ff6cf77f4273aa4906357b427d1f SHA512 e0e344cd215de67fe060b36fb1b902bab61454477624fbe41d2ec57fdd721cec9c8920ca834f0ef0ccfeedb961b17143f18197497557887d88911ff66e330478
 DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B e800b7bdce705db3ced97f0fe008e8391811f9c7c49e815b6cd2cf220cf1107f3941d29d7bcdd10f79da4e6cad9766243e482011aeb5a170e1c5920b6ebdd726 SHA512 2e2298a3cf800d9de669f560269bd07ca2b76f761198af10f7174759ea95a23518dedce83f481bdd392bb60adbd736e5dd2c21af88beb761c0f589f685737586
+DIST ccache-4.9-docs.tar.xz 82684 BLAKE2B bc3517803cac75a0124358f740e3f4f4b923341277b77cb9ac7649520bbf19a65a51ebf324cc886f98e606bd29681ca3956073a85b737159792e068d529e299c SHA512 870d15dc9e3a0557dfe533862927ff8e90730678439b576e782f79f1f69c5bb499ff4c7e397a7eca059691ec5f89412594e32c74209a58003a6f55002c00d467
+DIST ccache-4.9.tar.xz 583744 BLAKE2B 682b491d061452d77d988d7e9e661ed4ce729a40a58370af55e1f24c5e973e4808d7211b4f8b8ab7f9328ecc651c032fa2efd37675566308197c22fd9a776675 SHA512 04200e5ceab56fc119f4376189f45fe811409a8022f08e82cd3089e252f350d604d777a237a57651fcd0c20f8ba0f27e4f3cc330a5970d455a696a977408d563
+DIST ccache-4.9.tar.xz.asc 833 BLAKE2B ad91919ab45f98d334c9b2d273b8139a2fb64b28a3fdb2a2042beaaa32905978113cd08ff95a009891c6159505431e4c1e0203adca94032feb2a4cee9bd089e2 SHA512 2f51d11d00756d099a64a9e5698591385d2c822438123f1c9e753c66e35f4ea9706db3414d7049cb6604defebc72927b6772c4e8a2271e03fb80f815659f90fa

diff --git a/dev-util/ccache/ccache-4.9.ebuild b/dev-util/ccache/ccache-4.9.ebuild
new file mode 100644
index 000000000000..68cf3874b664
--- /dev/null
+++ b/dev-util/ccache/ccache-4.9.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2024 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 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
+LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+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="${MY_DOCS_USEFLAG} 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.9-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
+
+	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
+		-DHIREDIS_FROM_INTERNET=OFF
+		-DREDIS_STORAGE_BACKEND=$(usex redis)
+	)
+
+	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.9-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.9-avoid-run-user.patch
new file mode 100644
index 000000000000..ccce18b9d573
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.9-avoid-run-user.patch
@@ -0,0 +1,34 @@
+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/Config.cpp
++++ b/src/Config.cpp
+@@ -1194,17 +1194,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";
+ }