diff mbox series

[1/1] package/ccache: bump version to 4.9.1

Message ID 20240224121007.435474-1-bernd@kuhls.net
State Accepted
Headers show
Series [1/1] package/ccache: bump version to 4.9.1 | expand

Commit Message

Bernd Kuhls Feb. 24, 2024, 12:10 p.m. UTC 
Removed patch which is included in this release.

Updated license hash due to various version and copyright year bumps:
https://github.com/ccache/ccache/commits/master/LICENSE.adoc

Release notes: https://ccache.dev/releasenotes.html#_ccache_4_9_1

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...-fix-Work-around-GCC-12.3-bug-109241.patch | 29 -------------------
 package/ccache/ccache.hash                    |  4 +--
 package/ccache/ccache.mk                      |  2 +-
 3 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch

Comments

Marcus Hoffmann Feb. 28, 2024, 7:57 p.m. UTC | #1 
On 24.02.24 13:10, Bernd Kuhls wrote:
> Removed patch which is included in this release.
> 
> Updated license hash due to various version and copyright year bumps:
> https://github.com/ccache/ccache/commits/master/LICENSE.adoc
> 
> Release notes: https://ccache.dev/releasenotes.html#_ccache_4_9_1
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Tested-by: Marcus Hoffman <buildroot@bubu1.eu>

> ---
>   ...-fix-Work-around-GCC-12.3-bug-109241.patch | 29 -------------------
>   package/ccache/ccache.hash                    |  4 +--
>   package/ccache/ccache.mk                      |  2 +-
>   3 files changed, 3 insertions(+), 32 deletions(-)
>   delete mode 100644 package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch
> 
> diff --git a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch
> deleted file mode 100644
> index 42872597cd..0000000000
> --- a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -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;
> -           }
> -
> diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash
> index 736122e0ab..a2537077b6 100644
> --- a/package/ccache/ccache.hash
> +++ b/package/ccache/ccache.hash
> @@ -1,4 +1,4 @@
>   # sha256 computed locally
> -sha256  3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49  ccache-4.8.2.tar.xz
> +sha256  4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25  ccache-4.9.1.tar.xz
>   sha256  80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5  GPL-3.0.txt
> -sha256  55ce274f2b898dad70d3695ab13f82656fd455bd8fb6d1c85d6f7c453bef0b2e  LICENSE.adoc
> +sha256  a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84  LICENSE.adoc
> diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
> index ac4bc4aba5..1ac825439b 100644
> --- a/package/ccache/ccache.mk
> +++ b/package/ccache/ccache.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -CCACHE_VERSION = 4.8.2
> +CCACHE_VERSION = 4.9.1
>   CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION)
>   CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
>   CCACHE_LICENSE = GPL-3.0+, others
Arnout Vandecappelle April 7, 2024, 2:48 p.m. UTC | #2 
On 24/02/2024 13:10, Bernd Kuhls wrote:
> Removed patch which is included in this release.
> 
> Updated license hash due to various version and copyright year bumps:
> https://github.com/ccache/ccache/commits/master/LICENSE.adoc
> 
> Release notes: https://ccache.dev/releasenotes.html#_ccache_4_9_1
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   ...-fix-Work-around-GCC-12.3-bug-109241.patch | 29 -------------------
>   package/ccache/ccache.hash                    |  4 +--
>   package/ccache/ccache.mk                      |  2 +-
>   3 files changed, 3 insertions(+), 32 deletions(-)
>   delete mode 100644 package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch
> 
> diff --git a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch
> deleted file mode 100644
> index 42872597cd..0000000000
> --- a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -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;
> -           }
> -
> diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash
> index 736122e0ab..a2537077b6 100644
> --- a/package/ccache/ccache.hash
> +++ b/package/ccache/ccache.hash
> @@ -1,4 +1,4 @@
>   # sha256 computed locally
> -sha256  3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49  ccache-4.8.2.tar.xz
> +sha256  4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25  ccache-4.9.1.tar.xz
>   sha256  80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5  GPL-3.0.txt
> -sha256  55ce274f2b898dad70d3695ab13f82656fd455bd8fb6d1c85d6f7c453bef0b2e  LICENSE.adoc
> +sha256  a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84  LICENSE.adoc
> diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
> index ac4bc4aba5..1ac825439b 100644
> --- a/package/ccache/ccache.mk
> +++ b/package/ccache/ccache.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -CCACHE_VERSION = 4.8.2
> +CCACHE_VERSION = 4.9.1
>   CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION)
>   CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
>   CCACHE_LICENSE = GPL-3.0+, others
diff mbox series

Patch

diff --git a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch
deleted file mode 100644
index 42872597cd..0000000000
--- a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
-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;
-           }
- 
diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash
index 736122e0ab..a2537077b6 100644
--- a/package/ccache/ccache.hash
+++ b/package/ccache/ccache.hash
@@ -1,4 +1,4 @@ 
 # sha256 computed locally
-sha256  3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49  ccache-4.8.2.tar.xz
+sha256  4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25  ccache-4.9.1.tar.xz
 sha256  80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5  GPL-3.0.txt
-sha256  55ce274f2b898dad70d3695ab13f82656fd455bd8fb6d1c85d6f7c453bef0b2e  LICENSE.adoc
+sha256  a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84  LICENSE.adoc
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index ac4bc4aba5..1ac825439b 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-CCACHE_VERSION = 4.8.2
+CCACHE_VERSION = 4.9.1
 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION)
 CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
 CCACHE_LICENSE = GPL-3.0+, others