From patchwork Sun Jan 3 11:11:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3780 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4D7x0Q6hkCz3wgP for ; Sun, 3 Jan 2021 11:11:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4D7x0P2vtVz1gt; Sun, 3 Jan 2021 11:11:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4D7x0P22LVz2yRv; Sun, 3 Jan 2021 11:11:33 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4D7x0M3Frrz2xlL for ; Sun, 3 Jan 2021 11:11:31 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4D7x0L5xNZzB6; Sun, 3 Jan 2021 11:11:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1609672290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=W88E0U1yb7AX8qybo+GT7qssNszM8RmKL66FlfzSd1c=; b=oyCuM81F1syw5reh6hvfnJUmzg+yg6ha7ZYCCYid7OJ3RfMT1QYLkxPpDQ+rSs84SqiooA 2FDL4TnwO2UGnqAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1609672290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=W88E0U1yb7AX8qybo+GT7qssNszM8RmKL66FlfzSd1c=; b=GEO8FOWnJ8L8bcjNyWKSi/AJrq/Xu0CVke+J/qxGWpTuBOJKFuSkT+z8WSF0pyxq9qoniF UzXdln1w4Zyp67IuDxeiDgTyg+DVXxNXe4DSJ1oIG/zVm+2w53DjGHV1YL79UXZOl1Vnco NLlV3D4OAC+qul6mAGjrbY8p7QUoGG7MvBWkJCbowj5nlsgTTRZZOW1XcvYZKAQFCK84oX HT0E2MTH7MhBODD0dtLI1E8RnFEeLHfC2dsN0n+MOzaYBFr3jcZ0JflQvdbSZYrOQYUVcS ykUFUug++5WH116hsGc5X1vaNVj9fpRB9q3nwUHWxVcvGjxMckCdswegpsMl4w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/3] toolchain: Add zstd Date: Sun, 3 Jan 2021 11:11:13 +0000 Message-Id: <20210103111115.10749-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- 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