diff options
author | 2022-09-23 02:55:26 +0100 | |
---|---|---|
committer | 2022-09-23 02:55:26 +0100 | |
commit | 93ff4df64ce3ad1585f52faca10a4bcafc86703f (patch) | |
tree | e22e1adca5577e5e5a8c5a20b74a415fb1f83ee0 /dev-util/ccache/files | |
parent | dev-libs/mpfr: drop 4.1.0-r1 (diff) | |
download | gentoo-93ff4df64ce3ad1585f52faca10a4bcafc86703f.tar.gz gentoo-93ff4df64ce3ad1585f52faca10a4bcafc86703f.tar.bz2 gentoo-93ff4df64ce3ad1585f52faca10a4bcafc86703f.zip |
dev-util/ccache: drop 4.6-r1, 4.6.1, 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-avoid-run-user.patch | 28 | ||||
-rw-r--r-- | dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch | 28 |
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"; - } |