diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-06-14 15:21:15 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-14 15:21:15 +0100 |
| commit | 1c382dc5dbc52576ac2300fee0498af8af44e7b4 (patch) | |
| tree | 45d2492f5c659cbb01120d4192c9be34841362bd /dev-util/ccache/files | |
| parent | b9e8f3cc44aed3b6da71c7510c6287bf7bbbc66b (diff) | |
Revert "gentoo auto-resync : 14:06:2023 - 15:13:45"
This reverts commit b9e8f3cc44aed3b6da71c7510c6287bf7bbbc66b.
Diffstat (limited to 'dev-util/ccache/files')
| -rw-r--r-- | dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch | 30 | ||||
| -rw-r--r-- | dev-util/ccache/files/ccache-4.8.1-test-typo.patch | 20 |
2 files changed, 50 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"; + } diff --git a/dev-util/ccache/files/ccache-4.8.1-test-typo.patch b/dev-util/ccache/files/ccache-4.8.1-test-typo.patch new file mode 100644 index 000000000000..f557d24e6e93 --- /dev/null +++ b/dev-util/ccache/files/ccache-4.8.1-test-typo.patch @@ -0,0 +1,20 @@ +https://github.com/ccache/ccache/pull/1287 + +From efad3d7c1d18a260b694904fe695e6abd7dfd4df Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 20 May 2023 05:30:54 +0100 +Subject: [PATCH] test: Fix typo (missing line continuation) + +Fixes: ef634bdb292e1e24b8d1b5490e7857144a77c0fd +--- a/test/suites/base.bash ++++ b/test/suites/base.bash +@@ -552,7 +552,7 @@ fi + # ------------------------------------------------------------------------- + TEST "Directory is not hashed if using -gz" + +- if $COMPILER -c test1.c -gz 2>/dev/null ++ if $COMPILER -c test1.c -gz 2>/dev/null \ + && $COMPILER -E test1.c -gz >preprocessed.i 2>/dev/null \ + && [ -s preprocessed.i ] \ + && ! grep -Fq $PWD preprocessed.i; then + |