From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 30 Dec 2020 14:33:32 +0000 (+0000)
Subject: toolchain: Add zstd
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3569ac98ece03ea0d6078c8e968d6dc3a192433;p=people%2Fms%2Fipfire-2.x.git

toolchain: Add zstd

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/zstd b/lfs/zstd
index c6af0f1299..a4f0e16997 100644
--- a/lfs/zstd
+++ b/lfs/zstd
@@ -30,7 +30,14 @@ THISAPP    = zstd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+ifeq "$(TOOLCHAIN)" "1"
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+  PREFIX = $(TOOLS_DIR)
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)
+  PREFIX = /usr
+endif
 
 ###############################################################################
 # 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=/usr install
+	cd $(DIR_APP) && make prefix=$(PREFIX) install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index cc19432ac3..3aaef68549 100755
--- a/make.sh
+++ b/make.sh
@@ -1032,6 +1032,7 @@ buildtoolchain() {
 	lfsmake1 binutils			PASS=2
 	lfsmake1 gcc			PASS=2
 	lfsmake1 zlib
+	lfsmake1 zstd
 	lfsmake1 ccache			PASS=2
 	lfsmake1 tcl
 	lfsmake1 expect