From a7689c2abcff4374b84d95fb2df980ec9a566965 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2024 19:00:40 +0000 Subject: gentoo auto-resync : 24:03:2024 - 19:00:40 --- dev-util/ccache/Manifest | 2 + dev-util/ccache/ccache-4.9.1-r1.ebuild | 132 ++++++++++++++++++++++++ dev-util/ccache/files/ccache-4.9.1-distcc.patch | 38 +++++++ 3 files changed, 172 insertions(+) create mode 100644 dev-util/ccache/ccache-4.9.1-r1.ebuild create mode 100644 dev-util/ccache/files/ccache-4.9.1-distcc.patch (limited to 'dev-util/ccache') diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index 070efbd5d81f..ac9cf93a1f0f 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -2,6 +2,7 @@ AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435 AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530ce8dbcfacb1c3835523ec41ff35701536698827f11c39c1e06641fcf6b57d374944ecb44888a66c7860f97b813 SHA512 cc53f44b173c1ae66258aa573182ae936304dac9daf8489a20c45dbe3d554df207bd93b370da2c86b22fbc4edf5fd954f84fd18812d97d41a88ea4c7926f117c AUX ccache-4.8-avoid-run-user.patch 1270 BLAKE2B 2ecdef4b319a2d3c2fd4740667ae22b6134d977b252d9d022acfab723cc9c2cd7f11ea4f2674d5461fba5e3cf5574de39a3df840451670b68689569b819f2cb3 SHA512 898b0d7041af9765ac2a5f26099256e96c881d39452eb0cc90d859f9f64dab2d31d673d6b538958337a6f7848eb2ebf309064e96c37567e271a42e46c948b0ea AUX ccache-4.9-avoid-run-user.patch 1274 BLAKE2B 04df088e408ac82390f8f2c83d1a148b067a9c0215f70b0e51c347b4bc0c7221b56ea2608b9035a70ec1e9c4668d50f11db2fa223a2dc21ea0cdde71e2beb548 SHA512 b0faf07c1d3bfeafe8c7b25106e9abaaee47c3439254c8cf92e1140957760d6cfaf25ca1076c935973e5b58730bb2188957902e25f2293b0e8754fb2f13fa625 +AUX ccache-4.9.1-distcc.patch 1425 BLAKE2B b6617c44d8722b11b56f0a8df9e97010aed501407ed6356ec49eccabf836a272c4e6bd94f146aa4959119c44bc335d8eedc5e2f3e99304c20c3bf0fefaeb0fd3 SHA512 9b80d72abc7a047c8ac617461bd8819997267cf731116a33b76c142406ed87704493ff4e76a45a71dbb5ad100a0165c1b73dc7d923f9df63b57977b7152bf669 AUX ccache-config-3 2171 BLAKE2B 2b2e3c61b6f6897847503a4c8fa3b906cea1f39e1ebd21f8313e6adc8b1106252c4ceb6dab7d8ba7f4eb520909adf409b7dc12da1904378a94275a7b3437f53c SHA512 8ebb4b8992074ce41bbc6098094ecd993c012bb62ece1b86fade76df73465f558872354ab24e6037a5bf71428f2a03324782181ef0945e6e9dcf3418b608fa3b DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9 SHA512 e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb DIST ccache-4.8.3.tar.xz 569724 BLAKE2B 53211db0e516eea9739b8f05bf6a3db678b4b5cff7af741469360556da20a320e4a40253ca9e51568045a394d3497b428413ff6cf77f4273aa4906357b427d1f SHA512 e0e344cd215de67fe060b36fb1b902bab61454477624fbe41d2ec57fdd721cec9c8920ca834f0ef0ccfeedb961b17143f18197497557887d88911ff66e330478 @@ -12,6 +13,7 @@ DIST ccache-4.9.1.tar.xz.asc 833 BLAKE2B a157b0c2c0777732d9a51fb7519f561fac098bb DIST ccache-4.9.tar.xz 583744 BLAKE2B 682b491d061452d77d988d7e9e661ed4ce729a40a58370af55e1f24c5e973e4808d7211b4f8b8ab7f9328ecc651c032fa2efd37675566308197c22fd9a776675 SHA512 04200e5ceab56fc119f4376189f45fe811409a8022f08e82cd3089e252f350d604d777a237a57651fcd0c20f8ba0f27e4f3cc330a5970d455a696a977408d563 DIST ccache-4.9.tar.xz.asc 833 BLAKE2B ad91919ab45f98d334c9b2d273b8139a2fb64b28a3fdb2a2042beaaa32905978113cd08ff95a009891c6159505431e4c1e0203adca94032feb2a4cee9bd089e2 SHA512 2f51d11d00756d099a64a9e5698591385d2c822438123f1c9e753c66e35f4ea9706db3414d7049cb6604defebc72927b6772c4e8a2271e03fb80f815659f90fa EBUILD ccache-4.8.3.ebuild 3752 BLAKE2B 0f308f104c92a68219f1a54b2122f6913030eaa59d72fe8730d0cdeff62d4db234146d4d2e6abed64f5c86b770ea335c8a06788590b6d23d040d869ab8e3347c SHA512 bec7baf39f9f603fa242be8bfba506431e1de7e8c8f182a6f1b15fe14823748478dc24db2672282831baadb65153a1a20d19441ced32c56f0da6ec2ccd68d190 +EBUILD ccache-4.9.1-r1.ebuild 3793 BLAKE2B fea414050268f8e482cb1a15eb475306767a69e032c92f210a7f248b0f20fcb0077cce80e2d54e054271c11e73637d977c94e9585a69bb4be596ba8b06defbb8 SHA512 f0761dc2a39ad24cfae310fb3f0690389809ae3e482d15e0fea893d96fc06099ebebb17e8f15af5f6fb2c0a46cfb99b99e8b7449054680f122b97c2fe9ad218d EBUILD ccache-4.9.1.ebuild 3753 BLAKE2B 063506fa6e15a4eb56b9c73e72a99b5a36572834a3ffe431bb4a45e24b36bbe4b346651ccd5a37752ef026469d3ff8dd0a1fcfcb1001dc42e7596db4ccd33dc5 SHA512 77182f3bb63c2f301af8fc46b8c8a530a848e720bed2585d998b7895c7d83fc8aaec529e4af5f48835d48d35bc65a133b7d33538adef755cc264f7b85366a158 EBUILD ccache-4.9.ebuild 3760 BLAKE2B 2609fa81c3b2eecb895c9c97156af0259dff8fbdd4f29667272100f8fbfa8da3c7ebd225cf188f72c4b13c0230b372ba7b58b18d9c01da57a34df49743b93046 SHA512 01b76e8e9c3d048dc1f2f9fb33106c3da10320049242a571a4ee433af0d26a3b5e718defd540dbf7a642ca898efffe947b804e2d791ef9587e41c58e2db3b621 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1 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 +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. + -- cgit v1.2.3