[source] tools/ccache: Update ccache 3.3.2 and refresh patch

LEDE Commits lede-commits at lists.infradead.org
Tue Oct 4 02:50:58 PDT 2016


blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/792e8bc8bb99c688f43bb4cdab56b354c02fd18b

commit 792e8bc8bb99c688f43bb4cdab56b354c02fd18b
Author: Daniel Engberg <daniel.engberg.lists at pyret.net>
AuthorDate: Sun Oct 2 15:44:06 2016 -0500

    tools/ccache: Update ccache 3.3.2 and refresh patch
    
    Update ccache 3.3.2 and refresh patch
    
    Preserving the original patch comments here by Karl Vogel:
    
    "From 90762a9b8d9a50b6176f10bd6c2e2b9501117561 Mon Sep 17 00:00:00 2001
    From: Karl Vogel <karl.vogel at gmail.com>
    Date: Tue, 14 Jul 2015 11:05:33 +0200
    Subject: [PATCH] Include environment variable GCC_HONOUR_COPTS in hash.
    
    The OpenWRT patch, 910-mbsd_multi.patch, to GCC adds an extra
    compilation flag, -fhonour-copts, which is influenced by an
    environment variable called GCC_HONOUR_COPTS.
    
    Include this environment var in the hash calculation as otherwise
    the gcc stdout warning from a previous compilation might be shown
    where, even when GCC_HONOUR_COPTS is in 's'ilent mode.
    
    Signed-off-by: Karl Vogel <karl.vogel at gmail.com>"
    
    Signed-off-by: Daniel Engberg <daniel.engberg.lists at pyret.net>
---
 tools/ccache/Makefile                       |  4 ++--
 tools/ccache/patches/100-honour-copts.patch | 29 ++++-------------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
index 76b6957..2dbf03c 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:=3.1.11
+PKG_VERSION:=3.3.2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://samba.org/ftp/ccache/
-PKG_MD5SUM:=0f6df80c8941d9020a1fd5df5ad57dd7
+PKG_MD5SUM:=2767d8f88f5ec218983a2f05c9e20df2
 
 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 dc32885..fc82aa4 100644
--- a/tools/ccache/patches/100-honour-copts.patch
+++ b/tools/ccache/patches/100-honour-copts.patch
@@ -1,33 +1,12 @@
-From 90762a9b8d9a50b6176f10bd6c2e2b9501117561 Mon Sep 17 00:00:00 2001
-From: Karl Vogel <karl.vogel at gmail.com>
-Date: Tue, 14 Jul 2015 11:05:33 +0200
-Subject: [PATCH] Include environment variable GCC_HONOUR_COPTS in hash.
-
-The OpenWRT patch, 910-mbsd_multi.patch, to GCC adds an extra
-compilation flag, -fhonour-copts, which is influenced by an
-environment variable called GCC_HONOUR_COPTS.
-
-Include this environment var in the hash calculation as otherwise
-the gcc stdout warning from a previous compilation might be shown
-where, even when GCC_HONOUR_COPTS is in 's'ilent mode.
-
-Signed-off-by: Karl Vogel <karl.vogel at gmail.com>
----
- ccache.c | 1 +
- 1 file changed, 1 insertion(+)
-
 diff --git a/ccache.c b/ccache.c
-index e41af13..b736a9c 100644
+index 88e0ec5..7dffeb4 100644
 --- a/ccache.c
 +++ b/ccache.c
-@@ -965,6 +965,7 @@ calculate_object_hash(struct args *args, struct mdfour *hash, int direct_mode)
+@@ -1762,6 +1762,7 @@ calculate_object_hash(struct args *args, struct mdfour *hash, int direct_mode)
  			"CPLUS_INCLUDE_PATH",
  			"OBJC_INCLUDE_PATH",
- 			"OBJCPLUS_INCLUDE_PATH", /* clang */
+ 			"OBJCPLUS_INCLUDE_PATH", // clang
 +			"GCC_HONOUR_COPTS",
  			NULL
  		};
- 		for (p = envvars; *p != NULL ; ++p) {
--- 
-1.9.1
-
+ 		for (const char **p = envvars; *p; ++p) {



More information about the lede-commits mailing list