domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/ccache: Update ccache 3.3.2 and refresh patch

Browse Source 
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@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@gmail.com>"

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
This commit is contained in:
Daniel Engberg
2016-10-02 15:44:06 -05:00
committed by John Crispin
parent 8a542b8516
commit 792e8bc8bb
2 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ccache/Makefile
View File

@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
PKG_NAME:=ccache PKG_NAME:=ccache
PKG_VERSION:=3.1.11 PKG_VERSION:=3.3.2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://samba.org/ftp/ccache/ PKG_SOURCE_URL:=http://samba.org/ftp/ccache/
PKG_MD5SUM:=0f6df80c8941d9020a1fd5df5ad57dd7 PKG_MD5SUM:=2767d8f88f5ec218983a2f05c9e20df2
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk

29
tools/ccache/patches/100-honour-copts.patch
View File

@@ -1,33 +1,12 @@
From 90762a9b8d9a50b6176f10bd6c2e2b9501117561 Mon Sep 17 00:00:00 2001
From: Karl Vogel <karl.vogel@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@gmail.com>
---
ccache.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/ccache.c b/ccache.c diff --git a/ccache.c b/ccache.c
index e41af13..b736a9c 100644 index 88e0ec5..7dffeb4 100644
--- a/ccache.c --- a/ccache.c
+++ b/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", "CPLUS_INCLUDE_PATH",
"OBJC_INCLUDE_PATH", "OBJC_INCLUDE_PATH",
"OBJCPLUS_INCLUDE_PATH", /* clang */ "OBJCPLUS_INCLUDE_PATH", // clang
+ "GCC_HONOUR_COPTS", + "GCC_HONOUR_COPTS",
NULL NULL
}; };
for (p = envvars; *p != NULL ; ++p) { for (const char **p = envvars; *p; ++p) {
--
1.9.1