tools/ccache: update to 4.12.1

Release Notes:
https://ccache.dev/releasenotes.html#_ccache_4_12_1

Patch manually refreshed:
- 100-honour-copts.patch

Signed-off-by: Nick Hainke <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20837
Signed-off-by: Christian Marangi <[email protected]>

diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
index 86b56c123a8dcb9f3995212069feff2d0720d314..8bacf2781cce023e026b9bd779e22ad93af7f65c 100644 (file)
--- a/tools/ccache/Makefile
+++ b/tools/ccache/Makefile
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ccache
-PKG_VERSION:=4.11.3
+PKG_VERSION:=4.12.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)
-PKG_HASH:=28a407314f03a7bd7a008038dbaffa83448bc670e2fc119609b1d99fb33bb600
+PKG_HASH:=a3da50ab0fb0d42f60c17d1450312e6ace9b681f6221cb77c8a09a845f9d760c
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk

diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch
index 8c95685b286836327f498131835abf4cc6721cfc..447a0600647d8c030e50e32d878f3f3c08ed4999 100644 (file)
--- a/tools/ccache/patches/100-honour-copts.patch
+++ b/tools/ccache/patches/100-honour-copts.patch
@@ -1,10 +1,10 @@
 --- a/src/ccache/ccache.cpp
 +++ b/src/ccache/ccache.cpp
-@@ -2018,6 +2018,7 @@ get_manifest_key(Context& ctx, Hash& has
+@@ -2181,6 +2181,7 @@ get_manifest_key(Context& ctx, Hash& has
      "OBJCPLUS_INCLUDE_PATH",        // Clang
      "CLANG_CONFIG_FILE_SYSTEM_DIR", // Clang
      "CLANG_CONFIG_FILE_USER_DIR",   // Clang
 +    "GCC_HONOUR_COPTS",
-     nullptr,
+     "INCLUDE",                      // MSVC
+     "EXTERNAL_INCLUDE",             // MSVC
    };
-   for (const char** p = envvars; *p; ++p) {