From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001 From: James <> Date: Wed, 4 Nov 2015 11:49:21 +0000 Subject: trunk-47381 --- tools/ccache/Makefile | 35 +++++++++++++++++++++++++++++ tools/ccache/files/ccache_cc | 2 ++ tools/ccache/files/ccache_cxx | 2 ++ tools/ccache/patches/100-honour-copts.patch | 33 +++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 tools/ccache/Makefile create mode 100755 tools/ccache/files/ccache_cc create mode 100755 tools/ccache/files/ccache_cxx create mode 100644 tools/ccache/patches/100-honour-copts.patch (limited to 'tools/ccache') diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile new file mode 100644 index 0000000..76b6957 --- /dev/null +++ b/tools/ccache/Makefile @@ -0,0 +1,35 @@ +# +# Copyright (C) 2006-2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/target.mk + +PKG_NAME:=ccache +PKG_VERSION:=3.1.11 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=http://samba.org/ftp/ccache/ +PKG_MD5SUM:=0f6df80c8941d9020a1fd5df5ad57dd7 + +include $(INCLUDE_DIR)/host-build.mk + +HOST_CONFIGURE_VARS += CC="$(HOSTCC_NOCACHE)" + +define Host/Install/ccache + $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ + $(CP) ./files/* $(STAGING_DIR_HOST)/bin/ +endef + +define Host/Clean + -$(MAKE) -C $(HOST_BUILD_DIR) uninstall + $(call Host/Clean/Default) +endef +define Host/Install + $(call Host/Install/Default) + $(call Host/Install/ccache) +endef + +$(eval $(call HostBuild)) diff --git a/tools/ccache/files/ccache_cc b/tools/ccache/files/ccache_cc new file mode 100755 index 0000000..01c4ad4 --- /dev/null +++ b/tools/ccache/files/ccache_cc @@ -0,0 +1,2 @@ +#!/bin/sh +exec ccache "${TARGET_CC_NOCACHE}" "$@" diff --git a/tools/ccache/files/ccache_cxx b/tools/ccache/files/ccache_cxx new file mode 100755 index 0000000..cc60eb3 --- /dev/null +++ b/tools/ccache/files/ccache_cxx @@ -0,0 +1,2 @@ +#!/bin/sh +exec ccache "${TARGET_CXX_NOCACHE}" "$@" diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch new file mode 100644 index 0000000..dc32885 --- /dev/null +++ b/tools/ccache/patches/100-honour-copts.patch @@ -0,0 +1,33 @@ +From 90762a9b8d9a50b6176f10bd6c2e2b9501117561 Mon Sep 17 00:00:00 2001 +From: Karl Vogel +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 +--- + ccache.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ccache.c b/ccache.c +index e41af13..b736a9c 100644 +--- a/ccache.c ++++ b/ccache.c +@@ -965,6 +965,7 @@ calculate_object_hash(struct args *args, struct mdfour *hash, int direct_mode) + "CPLUS_INCLUDE_PATH", + "OBJC_INCLUDE_PATH", + "OBJCPLUS_INCLUDE_PATH", /* clang */ ++ "GCC_HONOUR_COPTS", + NULL + }; + for (p = envvars; *p != NULL ; ++p) { +-- +1.9.1 + -- cgit v1.2.3