summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Hainke2025-11-20 07:06:40 +0000
committerChristian Marangi2025-11-20 13:00:41 +0000
commit075ec5501ad44492733fe0393d19903b930106b1 (patch)
tree729891a3fbeeb00e7966bd8a541189ad13bb7af2
parent15fb19cdb31c7ee33437b1182fea15d9848527a4 (diff)
downloadopenwrt-075ec5501ad44492733fe0393d19903b930106b1.tar.gz
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 <vincent@systemli.org> Link: https://github.com/openwrt/openwrt/pull/20837 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
-rw-r--r--tools/ccache/Makefile4
-rw-r--r--tools/ccache/patches/100-honour-copts.patch6
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
index 86b56c123a..8bacf2781c 100644
--- 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 8c95685b28..447a060064 100644
--- 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) {