From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9B72A1581EE for ; Sun, 23 Mar 2025 07:51:01 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 92B863430BE for ; Sun, 23 Mar 2025 07:50:34 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 8DB941103B8; Sun, 23 Mar 2025 07:50:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 837341103B8 for ; Sun, 23 Mar 2025 07:50:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3718634308A for ; Sun, 23 Mar 2025 07:50:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94C6D19F7 for ; Sun, 23 Mar 2025 07:50:31 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1742716212.522b12c854ce0d8320ee70ba9785370c3f495ffe.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/ccache/Manifest dev-util/ccache/ccache-4.11.2.ebuild X-VCS-Directories: dev-util/ccache/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 522b12c854ce0d8320ee70ba9785370c3f495ffe X-VCS-Branch: master Date: Sun, 23 Mar 2025 07:50:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3fe153c8-e10f-47ca-94f6-c4e19ceba09a X-Archives-Hash: 59a70a821d950d7f0fdb23ee1261fd43 commit: 522b12c854ce0d8320ee70ba9785370c3f495ffe Author: Sam James gentoo org> AuthorDate: Sun Mar 23 07:49:44 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Mar 23 07:50:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=522b12c8 dev-util/ccache: add 4.11.2 Signed-off-by: Sam James gentoo.org> dev-util/ccache/Manifest | 2 + dev-util/ccache/ccache-4.11.2.ebuild | 147 +++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+) diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index d3c77ff3f4eb..57b304d5509f 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -4,5 +4,7 @@ DIST ccache-4.10.2.tar.xz.asc 833 BLAKE2B 4a975aa1e8c9c12cf4df60b31cea10023e8e8e DIST ccache-4.11-docs.tar.xz 86044 BLAKE2B c357dc3aa328a8201e62dfd92dc9380b2d5bbaf613a390305021a67f84199688e6fd6fb20489ad4ad81c45bbde44c8133fd12dc5f33cd7925fbde795fe5927e0 SHA512 58ffb519f24e33ac4394ce8dd5667ed1be67cab60ebcab7aa3c82adb31f14110992d0e56f8ebf2ef87e43bcfa202e1c05a4a187b5bcfc39a9bf0525d7039a0ce DIST ccache-4.11.1.tar.xz 500628 BLAKE2B 7a1f866d08232ff74eaa0bac84863bab9fb6a0f4c5c4326be212f1b7e61f10da0afe61d6816ca438afffe2a5be565161086f73c82c84563014f29bfe5e092cf8 SHA512 f7277bbf628e64e19780dd029d7fc0866ade28fa67efd93a72783422586e21beaaa3b0795ba3bfc7ef4403ba6e41823da90cbb6d88c1d5aa412111f3bcb1b7c5 DIST ccache-4.11.1.tar.xz.asc 833 BLAKE2B 5c005d488f8b30d1e286e22c13a28c3c7e2826193327c56d03bb713d343bc8cd29528973bbc4caa013bdbfecdcf6239910b6992518b66839d2aa6c81287cf497 SHA512 505c3ef267764b02fd998224afded2d7701e0fe8decfd10602da5ae8fea2f38c84ac2abc193e9f3260bd55ecbe7fd8696e0d416a43326ba19c61971f57c2c522 +DIST ccache-4.11.2.tar.xz 500800 BLAKE2B 4536cc3089cb8267fe4c01d3f4f6ffe962cec39d498b962d535a347bfbe1dda5e69652deb86e3e302667d1b51ea60e59a5c72c1acf55466174d0459b640167b7 SHA512 6c0f1243097ee93e7d73d5bdcd4609f771fd19e4b52afc5f9b813663b7d195ec503efb990c3b5205d8e9fa6dd16f78c031d93d5cff47223e6d4c1986ac1d6315 +DIST ccache-4.11.2.tar.xz.asc 833 BLAKE2B 194770651e233604848a74a724d45ec29988980e28f2e956422e362909abee27b1dc689e104e12d806590b4da2f967bac5f62405c305e970eebed9a212b69f33 SHA512 9471f88497f53a9bbafc907c502f62c8ea9adc08030e6c2dbf7f04d67478f3e3763fdf12f647a13ca5c6dbf0c7e0ba9c0fb5c05a7df4f54b7f44b8e41d1f79c6 DIST ccache-4.11.tar.xz 500508 BLAKE2B 40a8316e3db0a8a1cc4599d407e6f0bea91dacf21d50675e6f740542ae85deb0137ead368d13d5d5cc3e8f83b2a5f6e8acf0cdae72d1f40661ef145a386ce98c SHA512 38f48663a44750e6340214375445564957f185a4f272426cfd9d26077be5788c6f4e2901773703cc4b660c629c5d31c9c66b901603cb531d3f9787f559872c8e DIST ccache-4.11.tar.xz.asc 833 BLAKE2B 7bdee25a277a624f624bc20627c12c923e58b03a124ae0d66cb05657135b92d9b32d93658bf558bfdd138d4d8151c1bcab6c9657940d6becb60d00a18dfa353b SHA512 0f1f17fb1464d74654fbfccb686574927d2463fa687044d278a5728f01776f90c52fb3b4cec383bbfccc085fbf9c0ac6a6c58629c15e9969f703fa79ca3f79ba diff --git a/dev-util/ccache/ccache-4.11.2.ebuild b/dev-util/ccache/ccache-4.11.2.ebuild new file mode 100644 index 000000000000..53a111a563e2 --- /dev/null +++ b/dev-util/ccache/ccache-4.11.2.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2025 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 +# ccache, blake3, NonstdSpan, tl-expected +LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0" +LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 )" + +# TODO: package NonstdSpan, TlExpected +DEPEND=" + >=app-arch/zstd-1.3.4:= + !static-c++? ( + >=dev-cpp/cpp-httplib-0.10.6:= + >=dev-libs/libfmt-8.0.0:= + ) + >=dev-libs/blake3-1.4.0:= + >=dev-libs/xxhash-0.8.3 + redis? ( >=dev-libs/hiredis-0.13.3:= ) +" +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. +BDEPEND=" + doc? ( dev-ruby/asciidoctor ) + test? ( + >=dev-cpp/doctest-2.4.6 + dev-libs/elfutils + ) + 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.11-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 + + cp "${FILESDIR}"/ccache-config-3 ccache-config || die + eprefixify ccache-config +} + +src_configure() { + # Mainly used in tests + tc-export CC OBJDUMP + + local mycmakeargs=( + -DENABLE_DOCUMENTATION=$(usex doc) + -DENABLE_TESTING=$(usex test) + -DDEPS=LOCAL + -DREDIS_STORAGE_BACKEND=$(usex redis) + ) + + # 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. + if use static-c++ ; then + append-ldflags -static-libstdc++ + mycmakeargs+=( + -DDEP_CPPHTTPLIB=BUNDLED + -DDEP_FMT=BUNDLED + ) + fi + + 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 +}