CVS commit: pkgsrc/devel/ccache

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Aug  8 12:54:14 UTC 2023

Modified Files:
        pkgsrc/devel/ccache: distinfo
Added Files:
        pkgsrc/devel/ccache/patches: patch-src_storage_local_LocalStorage.cpp

Log Message:
ccache: work around ICE with GCC 12.3. From upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/devel/ccache/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/ccache/patches/patch-src_storage_local_LocalStorage.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ccache/distinfo
diff -u pkgsrc/devel/ccache/distinfo:1.57 pkgsrc/devel/ccache/distinfo:1.58
--- pkgsrc/devel/ccache/distinfo:1.57   Wed Jun 14 06:54:16 2023
+++ pkgsrc/devel/ccache/distinfo        Tue Aug  8 12:54:14 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.57 2023/06/14 06:54:16 adam Exp $
+$NetBSD: distinfo,v 1.58 2023/08/08 12:54:14 tnn Exp $
 
 BLAKE2s (ccache-4.8.2.tar.gz) = b0e28bf5bd36057423106825946be4707fa30cee7ed4b92bfeef915753aa4458
 SHA512 (ccache-4.8.2.tar.gz) = 61841b2ae307d99aeae2a21be66f56fa58f72b56a51c830f686218c03e04314757b7d38af4ac501a8280c9a67b0ca0f95ffc53b19543957d103223f990b97d4c
 Size (ccache-4.8.2.tar.gz) = 761497 bytes
+SHA1 (patch-src_storage_local_LocalStorage.cpp) = b16120f177f0ecd7b5b7c48fe265139629a4dd4f

Added files:

Index: pkgsrc/devel/ccache/patches/patch-src_storage_local_LocalStorage.cpp
diff -u /dev/null pkgsrc/devel/ccache/patches/patch-src_storage_local_LocalStorage.cpp:1.1
--- /dev/null   Tue Aug  8 12:54:14 2023
+++ pkgsrc/devel/ccache/patches/patch-src_storage_local_LocalStorage.cpp        Tue Aug  8 12:54:14 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_storage_local_LocalStorage.cpp,v 1.1 2023/08/08 12:54:14 tnn Exp $
+
+Work around ICE with GCC 12.3.
+https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5.patch
+
+--- src/storage/local/LocalStorage.cpp.orig    2023-08-08 12:48:56.432136174 +0000
++++ src/storage/local/LocalStorage.cpp
+@@ -708,7 +708,9 @@ LocalStorage::recompress(const std::opti
+           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;
+           }
+