From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/3] toolchain: Add zstd
Date: Sun, 03 Jan 2021 11:11:13 +0000
Message-ID: <20210103111115.10749-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7856380265802488835=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/zstd | 11 +++++++++--
 make.sh  |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lfs/zstd b/lfs/zstd
index c6af0f129..a4f0e1699 100644
--- a/lfs/zstd
+++ b/lfs/zstd
@@ -30,7 +30,14 @@ THISAPP    =3D zstd-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
-TARGET     =3D $(DIR_INFO)/$(THISAPP)
+
+ifeq "$(TOOLCHAIN)" "1"
+  TARGET =3D $(DIR_INFO)/$(THISAPP)-tools
+  PREFIX =3D $(TOOLS_DIR)
+else
+  TARGET =3D $(DIR_INFO)/$(THISAPP)
+  PREFIX =3D /usr
+endif
=20
 ############################################################################=
###
 # Top-level Rules
@@ -74,6 +81,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make prefix=3D/usr install
+	cd $(DIR_APP) && make prefix=3D$(PREFIX) install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index cf4e779e4..a6c088dd5 100755
--- a/make.sh
+++ b/make.sh
@@ -1037,6 +1037,7 @@ buildtoolchain() {
 	lfsmake1 binutils			PASS=3D2
 	lfsmake1 gcc			PASS=3D2
 	lfsmake1 zlib
+	lfsmake1 zstd
 	lfsmake1 ccache			PASS=3D2
 	lfsmake1 tcl
 	lfsmake1 expect
--=20
2.20.1


--===============7856380265802488835==--