toolchain: Add zstd

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

diff --git a/lfs/zstd b/lfs/zstd
index a4549557bc1dd6cc76925d66173d4864e2d4b08e..127043539f2dcddfc9ef9bc4d79e3c4110fa1f76 100644 (file)
--- 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 86bf182ee55c72262be36ce02636dca58b89ff78..0703818625bfd988fbaee83f3aa9495d83b5e673 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1046,6 +1046,7 @@ buildtoolchain() {
        lfsmake1 binutils                       PASS=2
        lfsmake1 gcc                    PASS=2
        lfsmake1 zlib
+       lfsmake1 zstd
        lfsmake1 ccache                 PASS=2
        lfsmake1 tcl
        lfsmake1 expect