summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-08-22 21:04:22 +0100
committerSam James <sam@gentoo.org>2022-08-22 22:08:41 +0100
commitae6b3941bae945937367927bf2a651b220845071 (patch)
tree96953b92153a550698de91b795d152dd81753ccc /dev-util/ccache/files
parentdev-libs/libbpf: Sync 9999 (diff)
downloadgentoo-ae6b3941bae945937367927bf2a651b220845071.tar.gz
gentoo-ae6b3941bae945937367927bf2a651b220845071.tar.bz2
gentoo-ae6b3941bae945937367927bf2a651b220845071.zip
dev-util/ccache: add 4.6.2
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/ccache/files')
-rw-r--r--dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch
new file mode 100644
index 000000000000..ff579ca7fdb6
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch
@@ -0,0 +1,30 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
+... gets us closer, but not there yet.)
+
+And see https://github.com/ccache/ccache/discussions/1086#discussioncomment-3327565.
+
+https://bugs.gentoo.org/837362 for 4.6 issue.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -1039,14 +1039,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir() const
+ {
+- static const std::string run_user_tmp_dir = [] {
+-#ifdef HAVE_GETEUID
+- auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
+- if (Util::create_dir(dir) && access(dir.c_str(), W_OK) == 0) {
+- return dir;
+- }
+-#endif
+- return std::string();
+- }();
+- return !run_user_tmp_dir.empty() ? run_user_tmp_dir : m_cache_dir + "/tmp";
++ return m_cache_dir + "/tmp";
+ }