X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fccache;h=470890d65eb0376c1f5105ebfe85a60676da77c0;hp=454032d0e1ee902127799b767b6d93cc29f643ab;hb=6c4cc7ea1bcb58c586ae64ae6f76720b6b89bda4;hpb=3e5f5165063b57f09aadc43e5e549cc9673e1fa3

diff --git a/lfs/ccache b/lfs/ccache
index 454032d0e1..470890d65e 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-2017  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,16 +24,18 @@
 
 include Config
 
-VER        = 3.1.7
+VER        = 3.3.4
 
 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)) -static
+	CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+	CFLAGS := $(patsubst -mfpu=%,,$(CFLAGS))
+	CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 endif
 
 # Set max cache size to 5GB
@@ -47,7 +49,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 82257745eac54826527946e9e3d046f4
+$(DL_FILE)_MD5 = 95ab3c56284129cc2a32460c23069516
 
 install : $(TARGET)
 
@@ -76,28 +78,30 @@ $(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) && ./configure --prefix=/tools
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR)
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 
-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++
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(PASS)" "1"
+	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_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
 
 	@rm -rf $(DIR_APP)