|
@@ -0,0 +1,29 @@
|
|
|
|
+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.
|
|
|
|
+
|
|
|
|
+Upstream: https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5
|
|
|
|
+
|
|
|
|
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
|
|
+---
|
|
|
|
+ src/storage/local/LocalStorage.cpp | 4 +++-
|
|
|
|
+ 1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
+
|
|
|
|
+diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp
|
|
|
|
+index 3e5abe5074..d0a904e553 100644
|
|
|
|
+--- 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;
|
|
|
|
+ }
|
|
|
|
+
|