From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 6 Aug 2012 20:06:36 +0000 (+0200)
Subject: Merge branch 'ccache-update' into glibc-update2
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=51537b2aa8802586e6401785081b7f1fe6f39863;hp=8d35adb5b986bb31a3dd5b49c059614aa57ea09d

Merge branch 'ccache-update' into glibc-update2
---

diff --git a/lfs/ccache b/lfs/ccache
index b7cad8697..00f7cd7f4 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.6
+VER        = 3.1.7
 
 THISAPP    = ccache-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 343dc9b642e1d2af1e6bd8e474dde92e
+$(DL_FILE)_MD5 = 82257745eac54826527946e9e3d046f4
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index add76a2a3..19edce62e 100755
--- a/make.sh
+++ b/make.sh
@@ -222,7 +222,7 @@ prepareenv() {
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_COMPRESS=1
-    export CCACHE_HASHDIR=1
+    export CCACHE_COMPILERCHECK="none"
 
     # Remove pre-install list of installed files in case user erase some files before rebuild
     rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
diff --git a/tools/make-functions b/tools/make-functions
index b6e0ff3c3..545068939 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -298,7 +298,7 @@ entershell() {
 		CFLAGS="$CF2LAGS" CXXFLAGS="$CXX2FLAGS" \
 		CCACHE_DIR=/usr/src/ccache \
 		CCACHE_COMPRESS=1 \
-		CCACHE_HASHDIR=1 \
+		CCACHE_COMPILERCHECK="none" \
 		KVER=$KVER \
 		BUILDTARGET="$BUILDTARGET" \
 		MACHINE="$MACHINE" \
@@ -415,7 +415,8 @@ lfsmake2() {
 						CONFIG_ROOT=$CONFIG_ROOT \
 						NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
 						CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
-						CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+						CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+						CCACHE_COMPILERCHECK="none" \
 						KVER=$KVER MAKETUNING=$MAKETUNING \
 						BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
 						MACHINE_TYPE="$MACHINE_TYPE" \
@@ -448,7 +449,8 @@ ipfiremake() {
 						CONFIG_ROOT=$CONFIG_ROOT \
 						NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
 						CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
-						CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+						CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+						CCACHE_COMPILERCHECK="none" \
 						KVER=$KVER MAKETUNING=$MAKETUNING \
 						BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
 						MACHINE_TYPE="$MACHINE_TYPE" \
@@ -480,7 +482,8 @@ ipfiredist() {
 					CONFIG_ROOT=$CONFIG_ROOT \
 					NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
 					CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
-					CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+					CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+					CCACHE_COMPILERCHECK="none" \
 					KVER=$KVER \
 					BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
 					MACHINE_TYPE="$MACHINE_TYPE" \