aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2018-07-06 16:45:06 +0300
committerJo-Philipp Wich <jo@mein.io>2018-12-18 09:44:05 +0100
commit0291b76af96355625c856bf0128e30bba783f139 (patch)
tree6cbb010ae5a67598902ce2c97f2c0b8d83f251d5
parentbc6c4fcd2d67935f9eb2ef1e2e8c05078ec9a6d9 (diff)
downloadupstream-0291b76af96355625c856bf0128e30bba783f139.tar.gz
upstream-0291b76af96355625c856bf0128e30bba783f139.tar.bz2
upstream-0291b76af96355625c856bf0128e30bba783f139.zip
tools/ccache: update to 3.4.2
update version and refresh patch Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> (backported from 7ec931b7f01e8e9dc6463069237097950761996a)
-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 6fc06c10c2..111bd91bb6 100644
--- a/tools/ccache/Makefile
+++ b/tools/ccache/Makefile
@@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk
PKG_NAME:=ccache
-PKG_VERSION:=3.3.6
+PKG_VERSION:=3.4.2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://download.samba.org/pub/ccache/ \
https://samba.org/ftp/ccache/
-PKG_HASH:=410a27fdaff64ead6df3fa57fa74bca0eca6b5f6ac77d7288af1256f6b12141d
+PKG_HASH:=18a8b14367d63d3d37fb6c33cba60e1b7fcd7a63d608df97c9771ae0d234fee2
include $(INCLUDE_DIR)/host-build.mk
diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch
index 7a17fcb75f..1916d17c60 100644
--- a/tools/ccache/patches/100-honour-copts.patch
+++ b/tools/ccache/patches/100-honour-copts.patch
@@ -1,6 +1,6 @@
---- a/ccache.c
-+++ b/ccache.c
-@@ -1803,6 +1803,7 @@ calculate_object_hash(struct args *args,
+--- a/src/ccache.c
++++ b/src/ccache.c
+@@ -1859,6 +1859,7 @@ calculate_object_hash(struct args *args,
"CPLUS_INCLUDE_PATH",
"OBJC_INCLUDE_PATH",
"OBJCPLUS_INCLUDE_PATH", // clang