commit: baacb85f312792e72d5f289d841d78a28e14a05a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Mar 24 18:02:13 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 24 18:02:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baacb85f
dev-util/ccache: backport fix for distcc Thanks to satmd for reporting. Closes: https://bugs.gentoo.org/927740 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/ccache/ccache-4.9.1-r1.ebuild | 132 ++++++++++++++++++++++++ dev-util/ccache/files/ccache-4.9.1-distcc.patch | 38 +++++++ 2 files changed, 170 insertions(+) diff --git a/dev-util/ccache/ccache-4.9.1-r1.ebuild b/dev-util/ccache/ccache-4.9.1-r1.ebuild new file mode 100644 index 000000000000..8bac5338f821 --- /dev/null +++ b/dev-util/ccache/ccache-4.9.1-r1.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 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 +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 + "${FILESDIR}"/${P}-distcc.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 + + # 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.1-distcc.patch b/dev-util/ccache/files/ccache-4.9.1-distcc.patch new file mode 100644 index 000000000000..412e2562ae76 --- /dev/null +++ b/dev-util/ccache/files/ccache-4.9.1-distcc.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/927740 +https://github.com/ccache/ccache/issues/1406 +https://github.com/ccache/ccache/commit/33d390bb249ddf1a6b3bdecede71b12c70000da3 + +From 33d390bb249ddf1a6b3bdecede71b12c70000da3 Mon Sep 17 00:00:00 2001 +From: Joel Rosdahl <[email protected]> +Date: Wed, 21 Feb 2024 20:25:03 +0100 +Subject: [PATCH] fix: Allow nonexistent include files in preprocessor mode + +After 43c3a44aadcb nonexistent include files found in the preprocessed +output would increment "Could not read or parse input file" and fall +back to just running the compiler. This made ccache not attempt +preprocessor mode for generated code with #line header referencing files +that can't be found, e.g. in an out-of-source build scenario. + +Fix this by just disabling direct mode, restoring the pre-43c3a44aadcb +behavior in such cases. + +Fixes #1406. + +(cherry picked from commit 08da6cd4da41fa213d387f52e3cf1d1f2a42366b) +--- a/src/ccache.cpp ++++ b/src/ccache.cpp +@@ -352,7 +352,12 @@ remember_include_file(Context& ctx, + + DirEntry dir_entry(path, DirEntry::LogOnError::yes); + if (!dir_entry.exists()) { +- return tl::unexpected(Statistic::bad_input_file); ++ if (ctx.config.direct_mode()) { ++ LOG("Include file {} does not exist, disabling direct mode", ++ dir_entry.path()); ++ ctx.config.set_direct_mode(false); ++ } ++ return {}; + } + if (dir_entry.is_directory()) { + // Ignore directory, typically $PWD. +
