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 [thread overview]
Message-ID: <20210103111115.10749-1-michael.tremer@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]
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 = 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 cf4e779e4..a6c088dd5 100755
--- a/make.sh
+++ b/make.sh
@@ -1037,6 +1037,7 @@ buildtoolchain() {
lfsmake1 binutils PASS=2
lfsmake1 gcc PASS=2
lfsmake1 zlib
+ lfsmake1 zstd
lfsmake1 ccache PASS=2
lfsmake1 tcl
lfsmake1 expect
--
2.20.1
next reply other threads:[~2021-01-03 11:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-03 11:11 Michael Tremer [this message]
2021-01-03 11:11 ` [PATCH 2/3] ccache: Update to version 4.1 Michael Tremer
2021-01-03 11:11 ` [PATCH 3/3] make.sh: Build zstd earlier in stage2 Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210103111115.10749-1-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox