diff options
Diffstat (limited to 'dev-util/ccache/files')
-rw-r--r-- | dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch | 25 | ||||
-rw-r--r-- | dev-util/ccache/files/ccache-4.9-avoid-run-user.patch | 34 |
2 files changed, 34 insertions, 25 deletions
diff --git a/dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch b/dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch deleted file mode 100644 index a638930ad6ad..000000000000 --- a/dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/906310 -https://bugs.gentoo.org/906942 -https://github.com/ccache/ccache/issues/1289 -https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5 - -From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001 -From: Joel Rosdahl <joel@rosdahl.net> -Date: Tue, 1 Aug 2023 12:30:12 +0200 -Subject: [PATCH] fix: Work around GCC 12.3 bug 109241 - -See also #1289. ---- a/src/storage/local/LocalStorage.cpp -+++ b/src/storage/local/LocalStorage.cpp -@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional<int8_t> level, - auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index); - l2_content_lock.make_long_lived(lock_manager); - if (!l2_content_lock.acquire()) { -- LOG("Failed to acquire content lock for {}/{}", l1_index, l2_index); -+ // LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241 -+ LOG_RAW(fmt::format( -+ "Failed to acquire content lock for {}/{}", l1_index, l2_index)); - return; - } - - diff --git a/dev-util/ccache/files/ccache-4.9-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.9-avoid-run-user.patch new file mode 100644 index 000000000000..ccce18b9d573 --- /dev/null +++ b/dev-util/ccache/files/ccache-4.9-avoid-run-user.patch @@ -0,0 +1,34 @@ +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. +https://bugs.gentoo.org/883799 and https://bugs.gentoo.org/887019 fo 4.8 issue. +--- a/src/Config.cpp ++++ b/src/Config.cpp +@@ -1194,17 +1194,5 @@ Config::check_key_tables_consistency() + std::string + Config::default_temporary_dir() const + { +- static const std::string run_user_tmp_dir = [] { +-#ifndef _WIN32 +- const char* const xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"); +- if (xdg_runtime_dir && DirEntry(xdg_runtime_dir).is_directory()) { +- auto dir = FMT("{}/ccache-tmp", xdg_runtime_dir); +- if (fs::create_directories(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"; + } |