Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-09 02:43:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "ccache: update to 4.1"

Browse Source 
This reverts commit b1952dc259ce3eb7ac6023c9e02d5adf2546efca as it's
causing issues on the buildbot which uses some kind of ccache wrapper
and so the breakage needs to be investigated further:

 bash: cmake: command not found
 time: tools/ccache/compile#0.05#0.03#0.15
     ERROR: tools/ccache failed to build.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Petr Štetiar 2020-12-22 20:38:13 +01:00
parent d3c8881194
commit 67790f5695
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/ccache/Makefile
View File

@ -8,22 +8,25 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
PKG_NAME:=ccache PKG_NAME:=ccache
PKG_VERSION:=4.1 PKG_VERSION:=3.7.11
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)
PKG_HASH:=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99 PKG_HASH:=8d450208099a4d202bd7df87caaec81baee20ce9dd62da91e9ea7b95a9072f68
HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk
HOST_CONFIGURE_VARS += CC="$(HOSTCC_NOCACHE)"
define Host/Install/ccache define Host/Install/ccache
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
$(CP) ./files/* $(STAGING_DIR_HOST)/bin/ $(CP) ./files/* $(STAGING_DIR_HOST)/bin/
endef endef
define Host/Clean
-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
$(call Host/Clean/Default)
endef
define Host/Install define Host/Install
$(call Host/Install/Default) $(call Host/Install/Default)
$(call Host/Install/ccache) $(call Host/Install/ccache)

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

@ -1,10 +1,10 @@
--- a/src/ccache.cpp --- a/src/ccache.c
+++ b/src/ccache.cpp +++ b/src/ccache.c
@@ -1654,6 +1654,7 @@ calculate_result_name(Context& ctx, @@ -2277,6 +2277,7 @@ calculate_object_hash(struct args *args,
"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",
nullptr}; NULL
for (const char** p = envvars; *p; ++p) { };
const char* v = getenv(*p); for (const char **p = envvars; *p; ++p) {