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 From patchwork Sun Jan 3 11:11:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3781 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) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4D7x0S1004z3wgP for ; Sun, 3 Jan 2021 11:11:36 +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 4D7x0P4Y40z2n6; 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 4D7x0P35L6z2y3Z; 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) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4D7x0M3gRhz2xm2 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 4D7x0M25JMz1gt; Sun, 3 Jan 2021 11:11:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1609672291; 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: in-reply-to:in-reply-to:references:references; bh=2Ng/2G/QZDRWWAU5CRQbv+ZaeAfseYZ0h0rNhzvZOhg=; b=PmTYWKja3ePlhiNChOskJkkAtFpjgqhJGbteupPFLIpcdSLh4r6JNS8lOljHUJMqrFljEh qay8t0XwAgcZnkBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1609672291; 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: in-reply-to:in-reply-to:references:references; bh=2Ng/2G/QZDRWWAU5CRQbv+ZaeAfseYZ0h0rNhzvZOhg=; b=qVp9NobM7uKLoKOnq32X+Pfnj+GqFeWghw8pTM7Jt+8K/M0c6V+VSfvTr77T7C1dUu/6Zp Dmegwt2qxHnNLqShjxnMNbadHTCtrT/IUVmwAztw07VZ322SYTo2MK20xEcGHKA/ES5/b7 wehLnMEJ+fislvxrYwL7Exw8TbVak64BNqfzPZ97I/XsJpAZ0BCuYzAwaaCHhViYAgXjBk ZeAjBHqhTGw0sfdgMpzM0TW/yoArlzA0rPszwz7+/ZfpiCtqfIU/Q0BTT6Ymk1woowfYA6 tqhy3tzuttu7PvyZTWSu8R18enz/9H8NH5t7mBfbnTOWGviz0cVxWYXK+Ipb5Q== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/3] ccache: Update to version 4.1 Date: Sun, 3 Jan 2021 11:11:14 +0000 Message-Id: <20210103111115.10749-2-michael.tremer@ipfire.org> In-Reply-To: <20210103111115.10749-1-michael.tremer@ipfire.org> References: <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" This version has changed its build system to cmake and can use zstd. We build zstd just before this package, but depend on cmake from the host system. Signed-off-by: Michael Tremer --- lfs/ccache | 41 ++++++++++++----------------------------- make.sh | 3 +-- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/lfs/ccache b/lfs/ccache index e930f20d1..7782429dc 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -24,24 +24,13 @@ include Config -VER = 3.7.12 +VER = 4.1 THISAPP = ccache-$(VER) DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-pass$(PASS) - -ifeq "$(PASS)" "1" - CFLAGS := $(patsubst -march=%,,$(CFLAGS)) - CFLAGS := $(patsubst -mtune=%,,$(CFLAGS)) - CFLAGS := $(patsubst -mfpu=%,,$(CFLAGS)) - CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS)) - CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS)) - CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS)) - CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS)) - CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS)) -endif +TARGET = $(DIR_INFO)/$(THISAPP)-tools ############################################################################### # Top-level Rules @@ -51,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4c9a09ae499d1d82bb83e67f1068f9bb +$(DL_FILE)_MD5 = 539df5f81b853cb69e88f8dd148d9fc8 install : $(TARGET) @@ -81,30 +70,24 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR) - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - -ifeq "$(TOOLCHAIN)" "1" - ifeq "$(PASS)" "1" + cd $(DIR_APP) && mkdir -pv build + cd $(DIR_APP)/build && cmake \ + -DCMAKE_INSTALL_PREFIX=$(TOOLS_DIR) \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=$(TOOLS_DIR)/include \ + .. + cd $(DIR_APP)/build && make $(MAKETUNING) VERBOSE=1 + cd $(DIR_APP)/build && make install + + # Install symlinks mkdir -pv $(TOOLS_DIR)/ccache/bin ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/gcc ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/g++ ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/cc ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/c++ - ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(CROSSTARGET)-gcc - ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(CROSSTARGET)-g++ - ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(CROSSTARGET)-cc - ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(CROSSTARGET)-c++ - endif - - ifeq "$(PASS)" "2" ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-gcc ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-g++ ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-cc ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-c++ - endif -endif @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index a6c088dd5..886e02512 100755 --- a/make.sh +++ b/make.sh @@ -1028,7 +1028,6 @@ buildtoolchain() { export LOGFILE lfsmake1 stage1 - lfsmake1 ccache PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 lfsmake1 linux KCFG="-headers" @@ -1038,7 +1037,7 @@ buildtoolchain() { lfsmake1 gcc PASS=2 lfsmake1 zlib lfsmake1 zstd - lfsmake1 ccache PASS=2 + lfsmake1 ccache lfsmake1 tcl lfsmake1 expect lfsmake1 dejagnu From patchwork Sun Jan 3 11:11:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3782 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) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4D7x0T1nhFz3wgP for ; Sun, 3 Jan 2021 11:11:37 +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 4D7x0P6sM6z3Tb; 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 4D7x0P47VMz2yvr; 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) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4D7x0M4JT6z2xy0 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 4D7x0M2rxvz1mN; Sun, 3 Jan 2021 11:11:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1609672291; 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: in-reply-to:in-reply-to:references:references; bh=KufQUhNY2W8mKrLnaQFVLOLCKDiuc12SoD2QYPv7vM4=; b=WF5+wPESgMIJuQ9Z1SJNoXz1ExXTEoDgcncgcZj9IMox5Gz9YMdlQZ/dD0noAAPVyIQ5Wc v2IK4Fgd4EgXjBAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1609672291; 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: in-reply-to:in-reply-to:references:references; bh=KufQUhNY2W8mKrLnaQFVLOLCKDiuc12SoD2QYPv7vM4=; b=uFdKRXA6rUhV9C+zmxxiQLfciboV0BDXKdH+Li3DIqGwtmzeQqGLWfhiFsDRPMkdrjRtIS XVh6EfeJIsLxumqP6G8gv+u8yqRdAo/1XciCD9NBkLhuQ8EUc6+6eYJ5ifIUMtB7yW1KjG Ryfh1rjkdJWoyOPicLS/Ck5W3VreUlIhG/bpd8Aar/ThRnNrc6qsSA356ysm4p8ZY4702N qV8JJdwoFMGrPAgne2BerZJyYBqGCBVcVWHY3SJsZq/zBd0vJLmrVFWeuvujxU69826k3B Ib8hwW/rLJeRIAEzxjTYApgg7y+KObtocH2yNYwciqCu/sKsh3lk6CZuZBhI6w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/3] make.sh: Build zstd earlier in stage2 Date: Sun, 3 Jan 2021 11:11:15 +0000 Message-Id: <20210103111115.10749-3-michael.tremer@ipfire.org> In-Reply-To: <20210103111115.10749-1-michael.tremer@ipfire.org> References: <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" Since programs from the toolchain are linked against this, we need to make this library available in stage 2, too. Signed-off-by: Michael Tremer --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 886e02512..887298d1d 100755 --- a/make.sh +++ b/make.sh @@ -1079,6 +1079,7 @@ buildbase() { lfsmake2 tzdata lfsmake2 cleanup-toolchain lfsmake2 zlib + lfsmake2 zstd lfsmake2 binutils lfsmake2 gmp lfsmake2 gmp-compat @@ -1391,7 +1392,6 @@ buildipfire() { lfsmake2 spandsp lfsmake2 lz4 lfsmake2 lzo - lfsmake2 zstd lfsmake2 openvpn lfsmake2 mpage lfsmake2 dbus