summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Hainke <vincent@systemli.org>2022-08-18 07:53:00 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2023-04-27 20:52:55 +0200
commiteeff8b3be101b639dd4d99e50bb0de0a3ae63f7c (patch)
tree00d8ae7f7238ad34f383cd051bb1dba03d586692
parent31b1366bc63968e92d023ad28de6d0896b640c78 (diff)
downloadopenwrt-eeff8b3be101b639dd4d99e50bb0de0a3ae63f7c.tar.gz
openwrt-eeff8b3be101b639dd4d99e50bb0de0a3ae63f7c.tar.bz2
openwrt-eeff8b3be101b639dd4d99e50bb0de0a3ae63f7c.zip
tools/ccache: update to 4.6.1
Release notes: https://ccache.dev/releasenotes.html#_ccache_4_6_1 Signed-off-by: Nick Hainke <vincent@systemli.org> (cherry picked from commit 2e87e24e43c49565e23643eb6eceef8455434647)
-rw-r--r--tools/ccache/Makefile4
-rw-r--r--tools/ccache/patches/100-honour-copts.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
index 9b2937dccd..9d03a6e82c 100644
--- a/tools/ccache/Makefile
+++ b/tools/ccache/Makefile
@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk
PKG_NAME:=ccache
-PKG_VERSION:=4.6
+PKG_VERSION:=4.6.1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)
-PKG_HASH:=3d2bb860f4359169e640f60cf7cc11da5fab5fb9aed55230d78141e49c3945e9
+PKG_HASH:=e5d47bd3cbb504ada864124690e7c0d28ecb1f9aeac22a9976025aed9633f3d1
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 a7fe4e4ec6..18ded55315 100644
--- a/tools/ccache/patches/100-honour-copts.patch
+++ b/tools/ccache/patches/100-honour-copts.patch
@@ -1,6 +1,6 @@
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
-@@ -1738,6 +1738,7 @@ calculate_result_and_manifest_key(Contex
+@@ -1754,6 +1754,7 @@ calculate_result_and_manifest_key(Contex
"CPLUS_INCLUDE_PATH",
"OBJC_INCLUDE_PATH",
"OBJCPLUS_INCLUDE_PATH", // clang