- updated to 3.1

Changed files:
    ccache-nohash_size_mtime.patch -> 1.2

diff --git a/ccache-nohash_size_mtime.patch b/ccache-nohash_size_mtime.patch
index 28901a7ace708b9ab06909e6ce565cfe0b67f518..700e69eb88caf734cbe0c37e0c174422da0ca9ab 100644 (file)
--- a/ccache-nohash_size_mtime.patch
+++ b/ccache-nohash_size_mtime.patch
@@ -1,34 +1,15 @@
---- ccache.1.orig      Mon Sep 13 06:38:30 2004
-+++ ccache.1   Tue Nov 15 14:59:46 2005
-@@ -234,6 +234,16 @@
- incorrect setting of this debug info rarely causes problems\&. If you
- strike problems with gdb not using the correct directory then enable
- this option\&.
-+.IP
-+.IP "\fBCCACHE_NOHASH_SIZE_MTIME\fP"
-+This tells ccache to not hash the real compiler's size and modification
-+time. Normally this is the mechanism to detect compiler upgrades.
-+There are situations however, where even though the compiler's size or
-+modification time has changed you can safely use the cached objects
-+(e.g. if as part of your build system the compiler is built as well
-+and the compiler's source has not changed; or if the compiler has only
-+changes that do not affect code generation). Use this feature only if
-+you know what you are doing.
- .IP 
- .IP "\fBCCACHE_UNIFY\fP" 
- If you set the environment variable CCACHE_UNIFY
---- ccache.c.orig      Mon Sep 13 06:38:30 2004
-+++ ccache.c   Tue Nov 15 14:59:46 2005
-@@ -331,8 +331,10 @@
-               hash_string(str_basename(args->argv[0]));
-       }
- 
--      hash_int(st.st_size);
--      hash_int(st.st_mtime);
-+      if (!getenv("CCACHE_NOHASH_SIZE_MTIME")) {
-+              hash_int(st.st_size);
-+              hash_int(st.st_mtime);
-+      }
- 
-       /* possibly hash the current working directory */
-       if (getenv("CCACHE_HASHDIR")) {
+--- ccache-3.1/ccache.c~       2010-09-16 19:01:09.000000000 +0200
++++ ccache-3.1/ccache.c        2010-10-02 18:16:57.670019849 +0200
+@@ -814,8 +814,10 @@
+               hash_file(hash, args->argv[0]);
+       } else if (str_eq(compilercheck, "mtime")) {
+               hash_delimiter(hash, "cc_mtime");
+-              hash_int(hash, st.st_size);
+-              hash_int(hash, st.st_mtime);
++              if (!getenv("CCACHE_NOHASH_SIZE_MTIME")) {
++                      hash_int(hash, st.st_size);
++                      hash_int(hash, st.st_mtime);
++              }
+       } else { /* command string */
+               if (!hash_multicommand_output(hash, compilercheck, orig_args->argv[0])) {
+                       fatal("Failure running compiler check command: %s", compilercheck);