summaryrefslogtreecommitdiff
path: root/dev-util/ccache/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-09-23 05:29:14 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-09-23 05:29:14 +0100
commit7f740fcb9a0165d81bfecf7fb5da647763d76a1b (patch)
tree45dab58d8bd40ef97234398e9e1850495ea60273 /dev-util/ccache/files
parent0bf5c5a0b1ff93d1f4aaa8cdea6acda5e42c2068 (diff)
gentoo auto-resync : 23:09:2022 - 05:29:13
Diffstat (limited to 'dev-util/ccache/files')
-rw-r--r--dev-util/ccache/files/ccache-4.6-avoid-run-user.patch28
-rw-r--r--dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch28
2 files changed, 0 insertions, 56 deletions
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
deleted file mode 100644
index cfdd09f79e66..000000000000
--- a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.)
-
-https://bugs.gentoo.org/837362 for 4.6 issue.
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -1031,14 +1031,5 @@ Config::check_key_tables_consistency()
- std::string
- Config::default_temporary_dir(const std::string& cache_dir)
- {
-- static const std::string run_user_tmp_dir = [] {
--#ifdef HAVE_GETEUID
-- auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
-- if (Util::create_dir(dir)) {
-- return dir;
-- }
--#endif
-- return std::string();
-- }();
-- return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
-+ return cache_dir + "/tmp";
- }
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
deleted file mode 100644
index 9dce69c63518..000000000000
--- a/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.)
-
-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 std::string& cache_dir)
- {
-- 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 : cache_dir + "/tmp";
-+ return cache_dir + "/tmp";
- }