]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
toolchain: Add zstd
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Dec 2020 14:33:32 +0000 (14:33 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Jul 2021 05:42:39 +0000 (07:42 +0200)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/zstd
make.sh

index 71f09ab403d044688bd7e046e37476a5d0150dfb..203a6951abdeaca9404a88c3825a171f1e869352 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 4a29bc665bc31f1765cb599ad95b4362c9585ad0..6fd1b077566a29c8aab42bde79bdd77a4034db6a 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