Updated ccache (3.0pre0)

diff --git a/lfs/ccache b/lfs/ccache
index 83ed803eb0998037ad6d06d98a6dd627e9ee6e96..2fc0c3d50e39567ec1801ef644421476ce3c6087 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.4
+VER        = 3.0pre0
 
 THISAPP    = ccache-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 73c1ed1e767c1752dd0f548ec1e66ce7
+$(DL_FILE)_MD5 = 3704f1cd486b1e63638fd17910c42e9f
 
 install : $(TARGET)
 
@@ -69,9 +69,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -p0 < $(DIR_SRC)/src/patches/$(THISAPP).patch
-       cd $(DIR_APP) && CFLAGS="-O2 -static" ./configure --prefix=$(ROOT)/usr/local
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/$(THISAPP)-no_compiler_mtime.patch
+       cd $(DIR_APP) && CFLAGS="-O2 -static -DDEFAULT_MAXSIZE=2097152" ./configure --prefix=$(ROOT)/usr/local
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        ln -sf ccache $(ROOT)/usr/local/bin/gcc

diff --git a/make.sh b/make.sh
index 8d79f1da0df3b7d20ace1186d6a047dd55c706b2..14c1b2c8a1122f292d67afa607fbafaa22b7ab93 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -36,7 +36,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=1
+TOOLCHAINVER=2
 IPFVER="full"                          # Which versions should be compiled? (full|devel)
 
 # Debian specific settings

diff --git a/src/patches/ccache-3.0pre0-no_compiler_mtime.patch b/src/patches/ccache-3.0pre0-no_compiler_mtime.patch
new file mode 100644 (file)
index 0000000..4bdc8d4
--- /dev/null
+++ b/src/patches/ccache-3.0pre0-no_compiler_mtime.patch
@@ -0,0 +1,19 @@
+diff -Naur ccache-3.0pre0.org/ccache.c ccache-3.0pre0/ccache.c
+--- ccache-3.0pre0.org/ccache.c        2010-02-28 21:14:39.000000000 +0100
++++ ccache-3.0pre0/ccache.c    2010-03-22 08:08:43.000000000 +0100
+@@ -849,12 +849,14 @@
+ 
+       compilercheck = getenv("CCACHE_COMPILERCHECK");
+       if (!compilercheck) {
+-              compilercheck = "mtime";
++              compilercheck = "size";
+       }
+       if (strcmp(compilercheck, "none") == 0) {
+               /* Do nothing. */
+       } else if (strcmp(compilercheck, "content") == 0) {
+               hash_file(&hash, args->argv[0]);
++      } else if (strcmp(compilercheck, "size") == 0){
++              hash_int(&hash, st.st_size);
+       } else { /* mtime */
+               hash_int(&hash, st.st_size);
+               hash_int(&hash, st.st_mtime);