X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fccache;h=44010f962248a3fba29b093880d004d8297a12e5;hp=6ae52330ac29e7ecc496a5f7d261dfc5c847247b;hb=8e27b3ca86497fc1843749dcfb1f3eecf5a6afbd;hpb=9c7da0c6d9adc6020a4815a90f0bb5930d57a97b

diff --git a/lfs/ccache b/lfs/ccache
index 6ae52330a..44010f962 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.6
+VER        = 3.1.8
 
 THISAPP    = ccache-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,6 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
 
+ifeq "$(PASS)" "1"
+	CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+	CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
+endif
+
+# Set max cache size to 5GB
+CFLAGS += -DDEFAULT_MAXSIZE=5242880
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 343dc9b642e1d2af1e6bd8e474dde92e
+$(DL_FILE)_MD5 = 0e0f25fb342dcb1196d9c2986a7323cf
 
 install : $(TARGET)
 
@@ -70,13 +78,28 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@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) && ./configure --prefix=/tools
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
-	ln -sf ccache $(ROOT)/usr/local/bin/gcc
-	ln -sf ccache $(ROOT)/usr/local/bin/g++
-	ln -sf ccache $(ROOT)/usr/local/bin/cc
-	$(ROOT)/usr/local/bin/ccache -z
+
+ifeq "$(PASS)" "1"
+	mkdir -pv /tools/ccache/bin
+	ln -svf ../../bin/ccache /tools/ccache/bin/gcc
+	ln -svf ../../bin/ccache /tools/ccache/bin/g++
+	ln -svf ../../bin/ccache /tools/ccache/bin/cc
+	ln -svf ../../bin/ccache /tools/ccache/bin/c++
+	ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-gcc
+	ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-g++
+	ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-cc
+	ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-c++
+endif
+
+ifeq "$(PASS)" "2"
+	ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-gcc
+	ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-g++
+	ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-cc
+	ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-c++
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)