From df969ff432872cf34de8ad17b032cd8a7b03b71c Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 24 Dec 2005 15:02:36 +0000
Subject: [PATCH] Clifford Wolf: 	Updated ccache (2.4)

[2005121420515002475] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6861 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/ccache/ccache.desc              |  4 ++--
 package/base/ccache/dont_stat_compiler.patch | 21 ++++++--------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/package/base/ccache/ccache.desc b/package/base/ccache/ccache.desc
index ee7bde0bb..2dd1f6900 100644
--- a/package/base/ccache/ccache.desc
+++ b/package/base/ccache/ccache.desc
@@ -35,8 +35,8 @@
 
 [L] GPL
 [S] Stable
-[V] 2.3
+[V] 2.4
 [P] X -1---5---9 103.800
 
-[D] 3284619110 ccache-2.3.tar.gz http://ccache.samba.org/ftp/ccache/
+[D] 1783193111 ccache-2.4.tar.gz http://ccache.samba.org/ftp/ccache/
 
diff --git a/package/base/ccache/dont_stat_compiler.patch b/package/base/ccache/dont_stat_compiler.patch
index 84f882c78..eb2f57287 100644
--- a/package/base/ccache/dont_stat_compiler.patch
+++ b/package/base/ccache/dont_stat_compiler.patch
@@ -19,25 +19,16 @@
 
 --- ./ccache.c.orig	Mon Feb 17 01:11:58 2003
 +++ ./ccache.c	Tue Feb 18 20:10:52 2003
-@@ -290,13 +290,15 @@
+@@ -331,8 +331,10 @@
+ 		hash_string(str_basename(args->argv[0]));
+ 	}
  
- 	/* the compiler driver size and date. This is a simple minded way
- 	   to try and detect compiler upgrades. It is not 100% reliable */
--	if (stat(args->argv[0], &st) != 0) {
--		cc_log("Couldn't stat the compiler!? (argv[0]='%s')\n", args->argv[0]);
--		stats_update(STATS_COMPILER);
--		failed();
+-	hash_int(st.st_size);
+-	hash_int(st.st_mtime);
 +	if (!getenv("CCACHE_DONT_STAT_COMPILER")) {
-+		if (stat(args->argv[0], &st) != 0) {
-+			cc_log("Couldn't stat the compiler!? (argv[0]='%s')\n", args->argv[0]);
-+			stats_update(STATS_COMPILER);
-+			failed();
-+		}
 +		hash_int(st.st_size);
 +		hash_int(st.st_mtime);
- 	}
--	hash_int(st.st_size);
--	hash_int(st.st_mtime);
++	}
  
  	/* possibly hash the current working directory */
  	if (getenv("CCACHE_HASHDIR")) {