X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fccache;h=682f4998a67ebccfc9efb5701e442b1146bf01b3;hp=b7cad8697d143be739ed38ecf1d66c33559ba517;hb=949c20d97f6b348701515049b042eff326ae4017;hpb=7273a322385000e403df6a9569f6352247b3ff30

diff --git a/lfs/ccache b/lfs/ccache
index b7cad8697d..682f4998a6 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,14 +24,23 @@
 
 include Config
 
-VER        = 3.1.6
+VER        = 3.2.3
 
 THISAPP    = ccache-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 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))
+	CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
+endif
+
+# Set max cache size to 5GB
+CFLAGS += -DDEFAULT_MAXSIZE=5242880
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +49,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 343dc9b642e1d2af1e6bd8e474dde92e
+$(DL_FILE)_MD5 = 608c78632086a4a051514722d6067a7b
 
 install : $(TARGET)
 
@@ -69,17 +78,29 @@ $(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
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	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)