mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-18 21:28:02 +00:00
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>
This commit is contained in:
parent
1302bee12a
commit
b1952dc259
@ -8,25 +8,22 @@ include $(TOPDIR)/rules.mk
|
|||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
PKG_NAME:=ccache
|
PKG_NAME:=ccache
|
||||||
PKG_VERSION:=3.7.11
|
PKG_VERSION:=4.1
|
||||||
|
|
||||||
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:=8d450208099a4d202bd7df87caaec81baee20ce9dd62da91e9ea7b95a9072f68
|
PKG_HASH:=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99
|
||||||
|
|
||||||
|
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)
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
--- a/src/ccache.c
|
--- a/src/ccache.cpp
|
||||||
+++ b/src/ccache.c
|
+++ b/src/ccache.cpp
|
||||||
@@ -2277,6 +2277,7 @@ calculate_object_hash(struct args *args,
|
@@ -1654,6 +1654,7 @@ calculate_result_name(Context& ctx,
|
||||||
"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
|
nullptr};
|
||||||
};
|
for (const char** p = envvars; *p; ++p) {
|
||||||
for (const char **p = envvars; *p; ++p) {
|
const char* v = getenv(*p);
|
||||||
|
Loading…
Reference in New Issue
Block a user