zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add patch so that ccache can compile with the standard gcc@12 version (#41249)

Browse Source
This commit is contained in:
Dave Keeshan 2023-11-27 13:33:30 +00:00 committed by GitHub
parent c564b2d969
commit b1b4ef6d1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
var/spack/repos/builtin/packages/ccache/fix-gcc-12.patch Normal file
View File

@ -0,0 +1,23 @@
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;
}

2
var/spack/repos/builtin/packages/ccache/package.py
View File

@ -72,6 +72,8 @@ class Ccache(CMakePackage):
conflicts("%clang@:7", when="@4.7:")
conflicts("%clang@:4", when="@4.4:")
patch("fix-gcc-12.patch", when="%gcc@12")
def cmake_args(self):
return [
self.define("ENABLE_TESTING", False),