X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fccache;h=44010f962248a3fba29b093880d004d8297a12e5;hb=cc24c14bfe52558aceb4489c8ef7a94fbe79edb0;hp=3a8dc6e53573045557fa0b4b38ab19684c29e80a;hpb=a97fad0546c235f07cd2e2c89cea03636d5709fb;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/ccache b/lfs/ccache
index 3a8dc6e53..44010f962 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.7
+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 = 82257745eac54826527946e9e3d046f4
+$(DL_FILE)_MD5 = 0e0f25fb342dcb1196d9c2986a7323cf
 
 install : $(TARGET)
 
@@ -70,15 +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) && CFLAGS="-O2 -static -DDEFAULT_MAXSIZE=5242880" ./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
-	ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-gcc
-	ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-g++
-	ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-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)