1 |
commit: 1ed449cc0f55f53a177ce4cc6c81463a0e04d633 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 9 04:28:33 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 9 04:30:27 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed449cc |
7 |
|
8 |
dev-util/ccache: add 4.6 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
dev-util/ccache/Manifest | 2 + |
13 |
dev-util/ccache/ccache-4.6.ebuild | 92 ++++++++++++++++++++++ |
14 |
.../ccache/files/ccache-4.1-avoid-run-user.patch | 6 ++ |
15 |
3 files changed, 100 insertions(+) |
16 |
|
17 |
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest |
18 |
index 8001b81d957a..29ab5c3c1a3d 100644 |
19 |
--- a/dev-util/ccache/Manifest |
20 |
+++ b/dev-util/ccache/Manifest |
21 |
@@ -1,3 +1,5 @@ |
22 |
DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f |
23 |
DIST ccache-4.4.2.tar.xz 510260 BLAKE2B f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1 SHA512 afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7 |
24 |
DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56 |
25 |
+DIST ccache-4.6.tar.xz 526084 BLAKE2B 2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24 SHA512 3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e |
26 |
+DIST ccache-4.6.tar.xz.asc 833 BLAKE2B e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71 SHA512 af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c |
27 |
|
28 |
diff --git a/dev-util/ccache/ccache-4.6.ebuild b/dev-util/ccache/ccache-4.6.ebuild |
29 |
new file mode 100644 |
30 |
index 000000000000..9bff72bc83a7 |
31 |
--- /dev/null |
32 |
+++ b/dev-util/ccache/ccache-4.6.ebuild |
33 |
@@ -0,0 +1,92 @@ |
34 |
+# Copyright 1999-2022 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=8 |
38 |
+ |
39 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc |
40 |
+inherit cmake toolchain-funcs flag-o-matic verify-sig |
41 |
+ |
42 |
+DESCRIPTION="Fast compiler cache" |
43 |
+HOMEPAGE="https://ccache.dev/" |
44 |
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz" |
45 |
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )" |
46 |
+ |
47 |
+LICENSE="GPL-3 LGPL-3" |
48 |
+SLOT="0" |
49 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
50 |
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 |
51 |
+IUSE="doc redis +static-c++ test" |
52 |
+RESTRICT="!test? ( test )" |
53 |
+ |
54 |
+DEPEND="app-arch/zstd:= |
55 |
+ redis? ( dev-libs/hiredis:= )" |
56 |
+RDEPEND="${DEPEND} |
57 |
+ dev-util/shadowman |
58 |
+ sys-apps/gentoo-functions" |
59 |
+# Needed for eselect calls in pkg_* |
60 |
+IDEPEND="dev-util/shadowman" |
61 |
+ |
62 |
+# clang-specific tests use dev-libs/elfutils to compare objects for equality. |
63 |
+# Let's pull in the dependency unconditionally. |
64 |
+DEPEND+=" test? ( dev-libs/elfutils )" |
65 |
+BDEPEND=" doc? ( dev-ruby/asciidoctor ) |
66 |
+ verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )" |
67 |
+ |
68 |
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) |
69 |
+ |
70 |
+PATCHES=( |
71 |
+ "${FILESDIR}"/${PN}-3.5-nvcc-test.patch |
72 |
+ "${FILESDIR}"/${PN}-4.0-objdump.patch |
73 |
+) |
74 |
+ |
75 |
+src_prepare() { |
76 |
+ cmake_src_prepare |
77 |
+ |
78 |
+ sed \ |
79 |
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ |
80 |
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die |
81 |
+} |
82 |
+ |
83 |
+src_configure() { |
84 |
+ # Mainly used in tests |
85 |
+ tc-export CC OBJDUMP |
86 |
+ |
87 |
+ # Avoid dependency on libstdc++.so. Useful for cases when |
88 |
+ # we would like to use ccache to build older gcc which injects |
89 |
+ # into ccache locally built (possibly outdated) libstdc++ |
90 |
+ # See bug #761220 for examples. |
91 |
+ # |
92 |
+ # Ideally gcc should not use LD_PRELOAD to avoid this type of failure. |
93 |
+ use static-c++ && append-ldflags -static-libstdc++ |
94 |
+ |
95 |
+ local mycmakeargs=( |
96 |
+ -DENABLE_DOCUMENTATION=$(usex doc) |
97 |
+ -DENABLE_TESTING=$(usex test) |
98 |
+ -DZSTD_FROM_INTERNET=OFF |
99 |
+ -DREDIS_STORAGE_BACKEND=$(usex redis) |
100 |
+ ) |
101 |
+ |
102 |
+ use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF ) |
103 |
+ |
104 |
+ cmake_src_configure |
105 |
+} |
106 |
+ |
107 |
+src_install() { |
108 |
+ cmake_src_install |
109 |
+ |
110 |
+ dobin ccache-config |
111 |
+ insinto /usr/share/shadowman/tools |
112 |
+ newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" |
113 |
+} |
114 |
+ |
115 |
+pkg_prerm() { |
116 |
+ if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then |
117 |
+ eselect compiler-shadow remove ccache |
118 |
+ fi |
119 |
+} |
120 |
+ |
121 |
+pkg_postinst() { |
122 |
+ if [[ -z ${ROOT} ]] ; then |
123 |
+ eselect compiler-shadow update ccache |
124 |
+ fi |
125 |
+} |
126 |
|
127 |
diff --git a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch |
128 |
index be7db76ecbf0..b1d0837ef3e0 100644 |
129 |
--- a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch |
130 |
+++ b/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch |
131 |
@@ -1,6 +1,12 @@ |
132 |
Gentoo's sandbox does not whitelist this path by default yet. |
133 |
TODO: bug link. |
134 |
|
135 |
+(4.1 update: |
136 |
+https://github.com/ccache/ccache/issues/984 |
137 |
+https://github.com/ccache/ccache/issues/1044 |
138 |
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1 |
139 |
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68) |
140 |
+ |
141 |
Until we have a sandbox whitelisting the path let's rely on ccache's default. |
142 |
--- a/src/Config.cpp |
143 |
+++ b/src/Config.cpp |