X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fccache;h=22e71a12dc6aceb5ff5a650d3605dc3533bf8ee7;hp=c35c6705dcead15477ab0bd1eb45be4f8c18f108;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=8c31790a2f706ff05471e864ecde7853fec0cb3a

diff --git a/lfs/ccache b/lfs/ccache
index c35c6705dc..22e71a12dc 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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,7 +24,7 @@
 
 include Config
 
-VER        = 3.2.3
+VER        = 3.4.1
 
 THISAPP    = ccache-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -34,8 +34,10 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
 
 ifeq "$(PASS)" "1"
 	CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+	CFLAGS := $(patsubst -mfpu=%,,$(CFLAGS))
 	CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
-	CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
+	CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
+	CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
 endif
 
 # Set max cache size to 5GB
@@ -49,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 608c78632086a4a051514722d6067a7b
+$(DL_FILE)_MD5 = 39492aea565c3e6d5affa633672a93bd
 
 install : $(TARGET)
 
@@ -79,28 +81,28 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/tools
+	cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR)
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 
 ifeq "$(TOOLCHAIN)" "1"
  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++
+	mkdir -pv $(TOOLS_DIR)/ccache/bin
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/gcc
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/g++
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/cc
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/c++
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(CROSSTARGET)-gcc
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(CROSSTARGET)-g++
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(CROSSTARGET)-cc
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/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++
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-gcc
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-g++
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-cc
+	ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-c++
  endif
 endif