commit: f042e243123fc221abc67206e714f12a12fece7b Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue May 16 16:10:49 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Mon May 22 21:25:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f042e243
dev-util/ccache: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31062 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../ccache/files/ccache-4.1-avoid-run-user.patch | 24 ---------------------- 1 file changed, 24 deletions(-) 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 deleted file mode 100644 index b1d0837ef3e0..000000000000 --- a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch +++ /dev/null @@ -1,24 +0,0 @@ -Gentoo's sandbox does not whitelist this path by default yet. -TODO: bug link. - -(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) - -Until we have a sandbox whitelisting the path let's rely on ccache's default. ---- a/src/Config.cpp -+++ b/src/Config.cpp -@@ -885,11 +885,5 @@ Config::check_key_tables_consistency() - std::string - Config::default_temporary_dir(const std::string& cache_dir) - { --#ifdef HAVE_GETEUID -- std::string user_tmp_dir = FMT("/run/user/{}", geteuid()); -- if (Stat::stat(user_tmp_dir).is_directory()) { -- return user_tmp_dir + "/ccache-tmp"; -- } --#endif - return cache_dir + "/tmp"; - }
