From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 515B815800A for ; Tue, 8 Aug 2023 02:10:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 749612BC013; Tue, 8 Aug 2023 02:10:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 533582BC01B for ; Tue, 8 Aug 2023 02:10:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B12A34027D for ; Tue, 8 Aug 2023 02:10:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BAA1F1F for ; Tue, 8 Aug 2023 02:10:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1691460588.c1683082f6735325895ab84e5d16801dc7fad2f5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/, dev-util/ccache/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/ccache/ccache-4.8.2.ebuild dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch X-VCS-Directories: dev-util/ccache/files/ dev-util/ccache/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c1683082f6735325895ab84e5d16801dc7fad2f5 X-VCS-Branch: master Date: Tue, 8 Aug 2023 02:10:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5b7ce00a-e892-4c32-9bc0-20f14f7056cd X-Archives-Hash: 61b19e7854a737c688aea6be0075a0f6 commit: c1683082f6735325895ab84e5d16801dc7fad2f5 Author: Sam James gentoo org> AuthorDate: Tue Aug 8 02:09:48 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Aug 8 02:09:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1683082 dev-util/ccache: backport ICE workaround Already fixed in stable GCC but let's backport as it makes life easier for people. Bug: https://bugs.gentoo.org/906310 Bug: https://bugs.gentoo.org/906942 Signed-off-by: Sam James gentoo.org> dev-util/ccache/ccache-4.8.2.ebuild | 1 + .../files/ccache-4.8.2-gcc-ice-workaround.patch | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dev-util/ccache/ccache-4.8.2.ebuild b/dev-util/ccache/ccache-4.8.2.ebuild index 782242e5b788..8ec5b78da959 100644 --- a/dev-util/ccache/ccache-4.8.2.ebuild +++ b/dev-util/ccache/ccache-4.8.2.ebuild @@ -62,6 +62,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.5-nvcc-test.patch "${FILESDIR}"/${PN}-4.0-objdump.patch "${FILESDIR}"/${PN}-4.8-avoid-run-user.patch + "${FILESDIR}"/${P}-gcc-ice-workaround.patch ) src_unpack() { 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 new file mode 100644 index 000000000000..a638930ad6ad --- /dev/null +++ b/dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch @@ -0,0 +1,25 @@ +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 +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 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; + } + +