1 |
commit: 93ff4df64ce3ad1585f52faca10a4bcafc86703f |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 23 01:55:26 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 23 01:55:26 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ff4df6 |
7 |
|
8 |
dev-util/ccache: drop 4.6-r1, 4.6.1, 4.6.2 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
dev-util/ccache/Manifest | 6 -- |
13 |
dev-util/ccache/ccache-4.6-r1.ebuild | 93 ---------------------- |
14 |
dev-util/ccache/ccache-4.6.1.ebuild | 93 ---------------------- |
15 |
dev-util/ccache/ccache-4.6.2.ebuild | 93 ---------------------- |
16 |
.../ccache/files/ccache-4.6-avoid-run-user.patch | 28 ------- |
17 |
.../ccache/files/ccache-4.6.1-avoid-run-user.patch | 28 ------- |
18 |
6 files changed, 341 deletions(-) |
19 |
|
20 |
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest |
21 |
index 92a864aa4108..b00c2ab50f9a 100644 |
22 |
--- a/dev-util/ccache/Manifest |
23 |
+++ b/dev-util/ccache/Manifest |
24 |
@@ -1,9 +1,3 @@ |
25 |
DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56 |
26 |
-DIST ccache-4.6.1.tar.xz 529040 BLAKE2B b4c1cae8b0c836c9e562488c79524ddbba4c995946e16f87c9b856e32961b454dd205bacdb030c283477be66d357b0fb5e67c9ad38715359b73f714aa73baee9 SHA512 361427ccecd74e8c25ca6a98ef3d3c125d81862196767eb383f6f8159fed8e1695cd5bc8731cb591c23c55352f0114a088b32a673717711efbfbb178a6c08c82 |
27 |
-DIST ccache-4.6.1.tar.xz.asc 833 BLAKE2B 2f9ca555a014cfc9dbc354f43d4db0d79f89a6f84c57a7b9452324854abb39cd21af1071404278c694212f38c3975c7fa702f7cc475e44f75e9b132e53088d5d SHA512 5494844f99232c5bc21f52db461f2a03d706e38bd73e147ebda89a4ce57fc2b80a920e42f7de539b9a5837ac8b515b309a29e045e479910c95a95d3c839b837d |
28 |
-DIST ccache-4.6.2.tar.xz 530952 BLAKE2B ef0fec6438ea69b109e918decb5e4a768ae0a5350e124b18cf700af7d307ed7a46509d02a9499aee87ed76a8fe5b9e4523ffec1fcc37b9b0a5ad56e5e713f8b8 SHA512 324c09c7cc76425552fd88e7483527c20ae977c817de1f0dff8a0102ae98f1c35d5e08c8a49c83ad76f6564ea912d9a500948051baa028139074913a6e07e452 |
29 |
-DIST ccache-4.6.2.tar.xz.asc 833 BLAKE2B dc4103d15808f044e47e27967df0b3ac063e40c4a40175958c99cf2609549657f4eec761f7d1103d8995ed7a86ad844cadd411fc4a4928901d78191f2dbe291b SHA512 66f42af7fb43ce1e701adaf911829d6690388e69249e6d97e0f51c31510f4198c22a7fdf68489f7b59fa07d311b2391be02d0a6702e8d890401318e4bfafd900 |
30 |
DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9 SHA512 b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966 |
31 |
DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89 |
32 |
-DIST ccache-4.6.tar.xz 526084 BLAKE2B 2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24 SHA512 3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e |
33 |
-DIST ccache-4.6.tar.xz.asc 833 BLAKE2B e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71 SHA512 af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c |
34 |
|
35 |
diff --git a/dev-util/ccache/ccache-4.6-r1.ebuild b/dev-util/ccache/ccache-4.6-r1.ebuild |
36 |
deleted file mode 100644 |
37 |
index 046476bcf614..000000000000 |
38 |
--- a/dev-util/ccache/ccache-4.6-r1.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,93 +0,0 @@ |
41 |
-# Copyright 1999-2022 Gentoo Authors |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI=8 |
45 |
- |
46 |
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc |
47 |
-inherit cmake toolchain-funcs flag-o-matic verify-sig |
48 |
- |
49 |
-DESCRIPTION="Fast compiler cache" |
50 |
-HOMEPAGE="https://ccache.dev/" |
51 |
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz" |
52 |
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )" |
53 |
- |
54 |
-LICENSE="GPL-3 LGPL-3" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
57 |
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 |
58 |
-IUSE="doc redis +static-c++ test" |
59 |
-RESTRICT="!test? ( test )" |
60 |
- |
61 |
-DEPEND="app-arch/zstd:= |
62 |
- redis? ( dev-libs/hiredis:= )" |
63 |
-RDEPEND="${DEPEND} |
64 |
- dev-util/shadowman |
65 |
- sys-apps/gentoo-functions" |
66 |
-# Needed for eselect calls in pkg_* |
67 |
-IDEPEND="dev-util/shadowman" |
68 |
- |
69 |
-# clang-specific tests use dev-libs/elfutils to compare objects for equality. |
70 |
-# Let's pull in the dependency unconditionally. |
71 |
-DEPEND+=" test? ( dev-libs/elfutils )" |
72 |
-BDEPEND=" doc? ( dev-ruby/asciidoctor ) |
73 |
- verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )" |
74 |
- |
75 |
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) |
76 |
- |
77 |
-PATCHES=( |
78 |
- "${FILESDIR}"/${PN}-3.5-nvcc-test.patch |
79 |
- "${FILESDIR}"/${PN}-4.0-objdump.patch |
80 |
- "${FILESDIR}"/${PN}-4.6-avoid-run-user.patch |
81 |
-) |
82 |
- |
83 |
-src_prepare() { |
84 |
- cmake_src_prepare |
85 |
- |
86 |
- sed \ |
87 |
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ |
88 |
- "${FILESDIR}"/ccache-config-3 > ccache-config || die |
89 |
-} |
90 |
- |
91 |
-src_configure() { |
92 |
- # Mainly used in tests |
93 |
- tc-export CC OBJDUMP |
94 |
- |
95 |
- # Avoid dependency on libstdc++.so. Useful for cases when |
96 |
- # we would like to use ccache to build older gcc which injects |
97 |
- # into ccache locally built (possibly outdated) libstdc++ |
98 |
- # See bug #761220 for examples. |
99 |
- # |
100 |
- # Ideally gcc should not use LD_PRELOAD to avoid this type of failure. |
101 |
- use static-c++ && append-ldflags -static-libstdc++ |
102 |
- |
103 |
- local mycmakeargs=( |
104 |
- -DENABLE_DOCUMENTATION=$(usex doc) |
105 |
- -DENABLE_TESTING=$(usex test) |
106 |
- -DZSTD_FROM_INTERNET=OFF |
107 |
- -DREDIS_STORAGE_BACKEND=$(usex redis) |
108 |
- ) |
109 |
- |
110 |
- use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF ) |
111 |
- |
112 |
- cmake_src_configure |
113 |
-} |
114 |
- |
115 |
-src_install() { |
116 |
- cmake_src_install |
117 |
- |
118 |
- dobin ccache-config |
119 |
- insinto /usr/share/shadowman/tools |
120 |
- newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" |
121 |
-} |
122 |
- |
123 |
-pkg_prerm() { |
124 |
- if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then |
125 |
- eselect compiler-shadow remove ccache |
126 |
- fi |
127 |
-} |
128 |
- |
129 |
-pkg_postinst() { |
130 |
- if [[ -z ${ROOT} ]] ; then |
131 |
- eselect compiler-shadow update ccache |
132 |
- fi |
133 |
-} |
134 |
|
135 |
diff --git a/dev-util/ccache/ccache-4.6.1.ebuild b/dev-util/ccache/ccache-4.6.1.ebuild |
136 |
deleted file mode 100644 |
137 |
index 95ae40faf2de..000000000000 |
138 |
--- a/dev-util/ccache/ccache-4.6.1.ebuild |
139 |
+++ /dev/null |
140 |
@@ -1,93 +0,0 @@ |
141 |
-# Copyright 1999-2022 Gentoo Authors |
142 |
-# Distributed under the terms of the GNU General Public License v2 |
143 |
- |
144 |
-EAPI=8 |
145 |
- |
146 |
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc |
147 |
-inherit cmake toolchain-funcs flag-o-matic verify-sig |
148 |
- |
149 |
-DESCRIPTION="Fast compiler cache" |
150 |
-HOMEPAGE="https://ccache.dev/" |
151 |
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz" |
152 |
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )" |
153 |
- |
154 |
-LICENSE="GPL-3 LGPL-3" |
155 |
-SLOT="0" |
156 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
157 |
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 |
158 |
-IUSE="doc redis +static-c++ test" |
159 |
-RESTRICT="!test? ( test )" |
160 |
- |
161 |
-DEPEND="app-arch/zstd:= |
162 |
- redis? ( dev-libs/hiredis:= )" |
163 |
-RDEPEND="${DEPEND} |
164 |
- dev-util/shadowman |
165 |
- sys-apps/gentoo-functions" |
166 |
-# Needed for eselect calls in pkg_* |
167 |
-IDEPEND="dev-util/shadowman" |
168 |
- |
169 |
-# clang-specific tests use dev-libs/elfutils to compare objects for equality. |
170 |
-# Let's pull in the dependency unconditionally. |
171 |
-DEPEND+=" test? ( dev-libs/elfutils )" |
172 |
-BDEPEND=" doc? ( dev-ruby/asciidoctor ) |
173 |
- verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )" |
174 |
- |
175 |
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) |
176 |
- |
177 |
-PATCHES=( |
178 |
- "${FILESDIR}"/${PN}-3.5-nvcc-test.patch |
179 |
- "${FILESDIR}"/${PN}-4.0-objdump.patch |
180 |
- "${FILESDIR}"/${PN}-4.6.1-avoid-run-user.patch |
181 |
-) |
182 |
- |
183 |
-src_prepare() { |
184 |
- cmake_src_prepare |
185 |
- |
186 |
- sed \ |
187 |
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ |
188 |
- "${FILESDIR}"/ccache-config-3 > ccache-config || die |
189 |
-} |
190 |
- |
191 |
-src_configure() { |
192 |
- # Mainly used in tests |
193 |
- tc-export CC OBJDUMP |
194 |
- |
195 |
- # Avoid dependency on libstdc++.so. Useful for cases when |
196 |
- # we would like to use ccache to build older gcc which injects |
197 |
- # into ccache locally built (possibly outdated) libstdc++ |
198 |
- # See bug #761220 for examples. |
199 |
- # |
200 |
- # Ideally gcc should not use LD_PRELOAD to avoid this type of failure. |
201 |
- use static-c++ && append-ldflags -static-libstdc++ |
202 |
- |
203 |
- local mycmakeargs=( |
204 |
- -DENABLE_DOCUMENTATION=$(usex doc) |
205 |
- -DENABLE_TESTING=$(usex test) |
206 |
- -DZSTD_FROM_INTERNET=OFF |
207 |
- -DREDIS_STORAGE_BACKEND=$(usex redis) |
208 |
- ) |
209 |
- |
210 |
- use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF ) |
211 |
- |
212 |
- cmake_src_configure |
213 |
-} |
214 |
- |
215 |
-src_install() { |
216 |
- cmake_src_install |
217 |
- |
218 |
- dobin ccache-config |
219 |
- insinto /usr/share/shadowman/tools |
220 |
- newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" |
221 |
-} |
222 |
- |
223 |
-pkg_prerm() { |
224 |
- if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then |
225 |
- eselect compiler-shadow remove ccache |
226 |
- fi |
227 |
-} |
228 |
- |
229 |
-pkg_postinst() { |
230 |
- if [[ -z ${ROOT} ]] ; then |
231 |
- eselect compiler-shadow update ccache |
232 |
- fi |
233 |
-} |
234 |
|
235 |
diff --git a/dev-util/ccache/ccache-4.6.2.ebuild b/dev-util/ccache/ccache-4.6.2.ebuild |
236 |
deleted file mode 100644 |
237 |
index e6fd6165c15d..000000000000 |
238 |
--- a/dev-util/ccache/ccache-4.6.2.ebuild |
239 |
+++ /dev/null |
240 |
@@ -1,93 +0,0 @@ |
241 |
-# Copyright 1999-2022 Gentoo Authors |
242 |
-# Distributed under the terms of the GNU General Public License v2 |
243 |
- |
244 |
-EAPI=8 |
245 |
- |
246 |
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc |
247 |
-inherit cmake toolchain-funcs flag-o-matic verify-sig |
248 |
- |
249 |
-DESCRIPTION="Fast compiler cache" |
250 |
-HOMEPAGE="https://ccache.dev/" |
251 |
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz" |
252 |
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )" |
253 |
- |
254 |
-LICENSE="GPL-3 LGPL-3" |
255 |
-SLOT="0" |
256 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
257 |
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 |
258 |
-IUSE="doc redis +static-c++ test" |
259 |
-RESTRICT="!test? ( test )" |
260 |
- |
261 |
-DEPEND="app-arch/zstd:= |
262 |
- redis? ( dev-libs/hiredis:= )" |
263 |
-RDEPEND="${DEPEND} |
264 |
- dev-util/shadowman |
265 |
- sys-apps/gentoo-functions" |
266 |
-# Needed for eselect calls in pkg_* |
267 |
-IDEPEND="dev-util/shadowman" |
268 |
- |
269 |
-# clang-specific tests use dev-libs/elfutils to compare objects for equality. |
270 |
-# Let's pull in the dependency unconditionally. |
271 |
-DEPEND+=" test? ( dev-libs/elfutils )" |
272 |
-BDEPEND=" doc? ( dev-ruby/asciidoctor ) |
273 |
- verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )" |
274 |
- |
275 |
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) |
276 |
- |
277 |
-PATCHES=( |
278 |
- "${FILESDIR}"/${PN}-3.5-nvcc-test.patch |
279 |
- "${FILESDIR}"/${PN}-4.0-objdump.patch |
280 |
- "${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch |
281 |
-) |
282 |
- |
283 |
-src_prepare() { |
284 |
- cmake_src_prepare |
285 |
- |
286 |
- sed \ |
287 |
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ |
288 |
- "${FILESDIR}"/ccache-config-3 > ccache-config || die |
289 |
-} |
290 |
- |
291 |
-src_configure() { |
292 |
- # Mainly used in tests |
293 |
- tc-export CC OBJDUMP |
294 |
- |
295 |
- # Avoid dependency on libstdc++.so. Useful for cases when |
296 |
- # we would like to use ccache to build older gcc which injects |
297 |
- # into ccache locally built (possibly outdated) libstdc++ |
298 |
- # See bug #761220 for examples. |
299 |
- # |
300 |
- # Ideally gcc should not use LD_PRELOAD to avoid this type of failure. |
301 |
- use static-c++ && append-ldflags -static-libstdc++ |
302 |
- |
303 |
- local mycmakeargs=( |
304 |
- -DENABLE_DOCUMENTATION=$(usex doc) |
305 |
- -DENABLE_TESTING=$(usex test) |
306 |
- -DZSTD_FROM_INTERNET=OFF |
307 |
- -DREDIS_STORAGE_BACKEND=$(usex redis) |
308 |
- ) |
309 |
- |
310 |
- use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF ) |
311 |
- |
312 |
- cmake_src_configure |
313 |
-} |
314 |
- |
315 |
-src_install() { |
316 |
- cmake_src_install |
317 |
- |
318 |
- dobin ccache-config |
319 |
- insinto /usr/share/shadowman/tools |
320 |
- newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" |
321 |
-} |
322 |
- |
323 |
-pkg_prerm() { |
324 |
- if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then |
325 |
- eselect compiler-shadow remove ccache |
326 |
- fi |
327 |
-} |
328 |
- |
329 |
-pkg_postinst() { |
330 |
- if [[ -z ${ROOT} ]] ; then |
331 |
- eselect compiler-shadow update ccache |
332 |
- fi |
333 |
-} |
334 |
|
335 |
diff --git a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch |
336 |
deleted file mode 100644 |
337 |
index cfdd09f79e66..000000000000 |
338 |
--- a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch |
339 |
+++ /dev/null |
340 |
@@ -1,28 +0,0 @@ |
341 |
-Gentoo's sandbox does not whitelist this path by default yet. |
342 |
- |
343 |
-(4.1 update: |
344 |
-https://github.com/ccache/ccache/issues/984 |
345 |
-https://github.com/ccache/ccache/issues/1044 |
346 |
-https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1 |
347 |
-https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68 |
348 |
-... gets us closer, but not there yet.) |
349 |
- |
350 |
-https://bugs.gentoo.org/837362 for 4.6 issue. |
351 |
---- a/src/Config.cpp |
352 |
-+++ b/src/Config.cpp |
353 |
-@@ -1031,14 +1031,5 @@ Config::check_key_tables_consistency() |
354 |
- std::string |
355 |
- Config::default_temporary_dir(const std::string& cache_dir) |
356 |
- { |
357 |
-- static const std::string run_user_tmp_dir = [] { |
358 |
--#ifdef HAVE_GETEUID |
359 |
-- auto dir = FMT("/run/user/{}/ccache-tmp", geteuid()); |
360 |
-- if (Util::create_dir(dir)) { |
361 |
-- return dir; |
362 |
-- } |
363 |
--#endif |
364 |
-- return std::string(); |
365 |
-- }(); |
366 |
-- return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp"; |
367 |
-+ return cache_dir + "/tmp"; |
368 |
- } |
369 |
|
370 |
diff --git a/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch |
371 |
deleted file mode 100644 |
372 |
index 9dce69c63518..000000000000 |
373 |
--- a/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch |
374 |
+++ /dev/null |
375 |
@@ -1,28 +0,0 @@ |
376 |
-Gentoo's sandbox does not whitelist this path by default yet. |
377 |
- |
378 |
-(4.1 update: |
379 |
-https://github.com/ccache/ccache/issues/984 |
380 |
-https://github.com/ccache/ccache/issues/1044 |
381 |
-https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1 |
382 |
-https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68 |
383 |
-... gets us closer, but not there yet.) |
384 |
- |
385 |
-https://bugs.gentoo.org/837362 for 4.6 issue. |
386 |
---- a/src/Config.cpp |
387 |
-+++ b/src/Config.cpp |
388 |
-@@ -1039,14 +1039,5 @@ Config::check_key_tables_consistency() |
389 |
- std::string |
390 |
- Config::default_temporary_dir(const std::string& cache_dir) |
391 |
- { |
392 |
-- static const std::string run_user_tmp_dir = [] { |
393 |
--#ifdef HAVE_GETEUID |
394 |
-- auto dir = FMT("/run/user/{}/ccache-tmp", geteuid()); |
395 |
-- if (Util::create_dir(dir) && access(dir.c_str(), W_OK) == 0) { |
396 |
-- return dir; |
397 |
-- } |
398 |
--#endif |
399 |
-- return std::string(); |
400 |
-- }(); |
401 |
-- return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp"; |
402 |
-+ return cache_dir + "/tmp"; |
403 |
- } |