X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=lfs%2Fccache;h=6fef8c685f5af270b258d1b49cfc824a2fe1393a;hb=HEAD;hp=44010f962248a3fba29b093880d004d8297a12e5;hpb=5fe5aedd2a809f1eac79eacd7b138e487a53b60c;p=ipfire-2.x.git

diff --git a/lfs/ccache b/lfs/ccache
index 44010f9622..6fef8c685f 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-2020  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,21 +24,13 @@
 
 include Config
 
-VER        = 3.1.8
+VER        = 4.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))
-endif
-
-# Set max cache size to 5GB
-CFLAGS += -DDEFAULT_MAXSIZE=5242880
+TARGET     = $(DIR_INFO)/$(THISAPP)-tools
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0e0f25fb342dcb1196d9c2986a7323cf
+$(DL_FILE)_BLAKE2 = 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090
 
 install : $(TARGET)
 
@@ -56,10 +48,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -68,8 +60,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -77,29 +69,25 @@ $(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
-	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++
-endif
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && mkdir -pv build
+	cd $(DIR_APP)/build && cmake \
+		-DCMAKE_INSTALL_PREFIX=$(TOOLS_DIR) \
+		-DCMAKE_INCLUDE_PATH=$(TOOLS_DIR)/include \
+		..
+	cd $(DIR_APP)/build && make $(MAKETUNING) VERBOSE=1
+	cd $(DIR_APP)/build && make install
+
+	# Install symlinks
+	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/$(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++
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)