From ef8e1fd72e8ca3621de62ad01650b64c5eb1dbb6 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 31 Aug 2023 13:00:48 +0000 Subject: [PATCH] ccache: update to 4.8.3 --- packages/devel/ccache/package.mk | 4 +-- ...0001-work-around-gcc-12-3-bug-109241.patch | 25 ------------------- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 packages/devel/ccache/patches/ccache-0001-work-around-gcc-12-3-bug-109241.patch diff --git a/packages/devel/ccache/package.mk b/packages/devel/ccache/package.mk index db5b0d3ec4..4c455acc7e 100644 --- a/packages/devel/ccache/package.mk +++ b/packages/devel/ccache/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ccache" -PKG_VERSION="4.8.2" -PKG_SHA256="3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49" +PKG_VERSION="4.8.3" +PKG_SHA256="e47374c810b248cfca3665ee1d86c7c763ffd68d9944bc422d9c1872611f2b11" PKG_LICENSE="GPL" PKG_SITE="https://ccache.dev/download.html" PKG_URL="https://github.com/ccache/ccache/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/devel/ccache/patches/ccache-0001-work-around-gcc-12-3-bug-109241.patch b/packages/devel/ccache/patches/ccache-0001-work-around-gcc-12-3-bug-109241.patch deleted file mode 100644 index d0edaf1d8a..0000000000 --- a/packages/devel/ccache/patches/ccache-0001-work-around-gcc-12-3-bug-109241.patch +++ /dev/null @@ -1,25 +0,0 @@ -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. ---- - 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 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; - } -