From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/3] ccache: Update to version 4.1
Date: Sun, 03 Jan 2021 11:11:14 +0000
Message-ID: <20210103111115.10749-2-michael.tremer@ipfire.org>
In-Reply-To: <20210103111115.10749-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4595110000490462884=="
List-Id: <development.lists.ipfire.org>

--===============4595110000490462884==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This version has changed its build system to cmake and
can use zstd. We build zstd just before this package, but
depend on cmake from the host system.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/ccache | 41 ++++++++++++-----------------------------
 make.sh    |  3 +--
 2 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/lfs/ccache b/lfs/ccache
index e930f20d1..7782429dc 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -24,24 +24,13 @@
=20
 include Config
=20
-VER        =3D 3.7.12
+VER        =3D 4.1
=20
 THISAPP    =3D ccache-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
-TARGET     =3D $(DIR_INFO)/$(THISAPP)-pass$(PASS)
-
-ifeq "$(PASS)" "1"
-	CFLAGS :=3D $(patsubst -march=3D%,,$(CFLAGS))
-	CFLAGS :=3D $(patsubst -mtune=3D%,,$(CFLAGS))
-	CFLAGS :=3D $(patsubst -mfpu=3D%,,$(CFLAGS))
-	CFLAGS :=3D $(patsubst -mfloat-abi=3D%,,$(CFLAGS))
-	CFLAGS :=3D $(patsubst -mindirect-branch=3D%,,$(CFLAGS))
-	CFLAGS :=3D $(patsubst -mfunction-return=3D%,,$(CFLAGS))
-	CFLAGS :=3D $(patsubst -fstack-clash-protection,,$(CFLAGS))
-	CFLAGS :=3D $(patsubst -fcf-protection,,$(CFLAGS))
-endif
+TARGET     =3D $(DIR_INFO)/$(THISAPP)-tools
=20
 ############################################################################=
###
 # Top-level Rules
@@ -51,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 4c9a09ae499d1d82bb83e67f1068f9bb
+$(DL_FILE)_MD5 =3D 539df5f81b853cb69e88f8dd148d9fc8
=20
 install : $(TARGET)
=20
@@ -81,30 +70,24 @@ $(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=3D$(TOOLS_DIR)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make install
-
-ifeq "$(TOOLCHAIN)" "1"
- ifeq "$(PASS)" "1"
+	cd $(DIR_APP) && mkdir -pv build
+	cd $(DIR_APP)/build && cmake \
+		-DCMAKE_INSTALL_PREFIX=3D$(TOOLS_DIR) \
+		-DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=3D$(TOOLS_DIR)/include \
+		..
+	cd $(DIR_APP)/build && make $(MAKETUNING) VERBOSE=3D1
+	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/$(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
=20
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index a6c088dd5..886e02512 100755
--- a/make.sh
+++ b/make.sh
@@ -1028,7 +1028,6 @@ buildtoolchain() {
 	export LOGFILE
=20
 	lfsmake1 stage1
-	lfsmake1 ccache			PASS=3D1
 	lfsmake1 binutils			PASS=3D1
 	lfsmake1 gcc			PASS=3D1
 	lfsmake1 linux			KCFG=3D"-headers"
@@ -1038,7 +1037,7 @@ buildtoolchain() {
 	lfsmake1 gcc			PASS=3D2
 	lfsmake1 zlib
 	lfsmake1 zstd
-	lfsmake1 ccache			PASS=3D2
+	lfsmake1 ccache
 	lfsmake1 tcl
 	lfsmake1 expect
 	lfsmake1 dejagnu
--=20
2.20.1


--===============4595110000490462884==--