diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-12-18 16:22:29 -0800 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-12-22 18:59:10 +0100 |
| commit | b1952dc259ce3eb7ac6023c9e02d5adf2546efca (patch) | |
| tree | f6fff6bbb24cb94ee9b3e95942b6c121acdb33bd /tools | |
| parent | 1302bee12ac94a651b7954d56f57a7193518a5d0 (diff) | |
| download | upstream-b1952dc259ce3eb7ac6023c9e02d5adf2546efca.tar.gz upstream-b1952dc259ce3eb7ac6023c9e02d5adf2546efca.tar.bz2 upstream-b1952dc259ce3eb7ac6023c9e02d5adf2546efca.zip | |
ccache: update to 4.1
Upstream switched to building with CMake. Adjust accordingly.
Reapplied patch as upstream changed the file format.
Added HOST_BUILD_PARALLEL for faster compilation.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ccache/Makefile | 13 | ||||
| -rw-r--r-- | tools/ccache/patches/100-honour-copts.patch | 20 |
2 files changed, 15 insertions, 18 deletions
diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile index 6e55001fd5..ee9ed08b28 100644 --- a/tools/ccache/Makefile +++ b/tools/ccache/Makefile @@ -8,25 +8,22 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk PKG_NAME:=ccache -PKG_VERSION:=3.7.11 +PKG_VERSION:=4.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION) -PKG_HASH:=8d450208099a4d202bd7df87caaec81baee20ce9dd62da91e9ea7b95a9072f68 +PKG_HASH:=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99 -include $(INCLUDE_DIR)/host-build.mk +HOST_BUILD_PARALLEL:=1 -HOST_CONFIGURE_VARS += CC="$(HOSTCC_NOCACHE)" +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/cmake.mk 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) diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch index ccfa1c0247..e4045ef9be 100644 --- a/tools/ccache/patches/100-honour-copts.patch +++ b/tools/ccache/patches/100-honour-copts.patch @@ -1,10 +1,10 @@ ---- a/src/ccache.c -+++ b/src/ccache.c -@@ -2277,6 +2277,7 @@ calculate_object_hash(struct args *args, - "CPLUS_INCLUDE_PATH", - "OBJC_INCLUDE_PATH", - "OBJCPLUS_INCLUDE_PATH", // clang -+ "GCC_HONOUR_COPTS", - NULL - }; - for (const char **p = envvars; *p; ++p) { +--- a/src/ccache.cpp ++++ b/src/ccache.cpp +@@ -1654,6 +1654,7 @@ calculate_result_name(Context& ctx, + "CPLUS_INCLUDE_PATH", + "OBJC_INCLUDE_PATH", + "OBJCPLUS_INCLUDE_PATH", // clang ++ "GCC_HONOUR_COPTS", + nullptr}; + for (const char** p = envvars; *p; ++p) { + const char* v = getenv(*p); |