X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fccache%2FMakefile;h=175cb11bdf35eed1ec398e5406dfb10c7ddc7cde;hb=b4917fa907ac6c746d00a3b19d5c7ef56bf6213b;hp=8848fa5102b2500deaa5b3207bcf35a9bbfc64a2;hpb=a53b084e497a9f1629a2caada833ebe14a6838b7;p=openwrt%2Fstaging%2Fwigyori.git

diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
index 8848fa5102..175cb11bdf 100644
--- a/tools/ccache/Makefile
+++ b/tools/ccache/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,47 +8,29 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=ccache
-PKG_VERSION:=3.1.7
+PKG_VERSION:=3.5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://samba.org/ftp/ccache/
-PKG_MD5SUM:=80a698c22d0b06b19c88ac58e8d8b632
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=https://download.samba.org/pub/ccache/ \
+		https://samba.org/ftp/ccache/
+PKG_HASH:=bdd44b72ae4506a2e2deef9fefb15c606a474bbca7658cd2be26105155eec012
 
 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
 
-ifneq ($(strip $(shell which ccache >/dev/null && echo found)),found)
-  define Host/Compile
-	$(MAKE) CC="$(HOSTCC_NOCACHE)" -C $(HOST_BUILD_DIR)
-  endef
-
-  define Host/Clean
+define Host/Clean
 	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
 	$(call Host/Clean/Default)
-  endef
-  define Host/Install
+endef
+define Host/Install
 	$(call Host/Install/Default)
 	$(call Host/Install/ccache)
-  endef
-else
-  define Host/Prepare
-  endef
-  define Host/Configure
-  endef
-  define Host/Compile
-  endef
-  define Host/Install
-	$(call Host/Install/ccache)
-  endef
-  define Host/Clean
-  endef
-  define Download
-  endef
-endif
+endef
 
 $(eval $(call HostBuild))