Message ID | 20220222125135.1211290-51-michael.tremer@ipfire.org |
---|---|
State | Accepted |
Commit | 9b1f666eae381924b1b3bc1666cadc9ef3320955 |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> 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 ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4K2zbn2vttz3xgV for <patchwork@web04.haj.ipfire.org>; Tue, 22 Feb 2022 12:52:53 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4K2zb02tCfz5gV; Tue, 22 Feb 2022 12:52:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4K2zZz01y8z30H7; Tue, 22 Feb 2022 12:52:11 +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 ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4K2zZs3rmyz2xVY for <development@lists.ipfire.org>; Tue, 22 Feb 2022 12:52:05 +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 4K2zZr4Ynsz5bC; Tue, 22 Feb 2022 12:52:04 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1645534324; 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=SNsoaCOeizrcPOuYCS4gnSCQgvoBs2GqRrlc76CRZfc=; b=wDJdbyZB5Qc/xVZO8tYkyPBbKvyW4PRPI6ISy8O8ARu3+r5Tiu0rgLyiYXCtxTkroyOC5j P3+eFXMca+vWZ7CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1645534324; 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=SNsoaCOeizrcPOuYCS4gnSCQgvoBs2GqRrlc76CRZfc=; b=YtM3kwDf6dCvwiuNwL5ZnD/KfsyqLfCzL9VSNFPOJGevppaHmLmsDHWQdTY0bKjkBbCQKJ RoeWdp74ceaoqpQqW/uGf4NPDt1efJjD/eBYubTzbCY2HvYDZL8t7E+j0lqocW7kcnS7Tr /OGM+eog3NrmryhO2xl35KXTeHEF191M9WJ8868qGyD0ZcwCtiJHP1zoFNBz4caZzIqgEu hz9Gy6gu+PVI0Uj7v1ygrqRPKpzB+nbPzJ+AAKUA9O5elKC/D8f2sjc6FcjkilfQT5v+Ag bw5ccL8SrQQkYh8GJyX6bcHxm9vZtiwYfx102hb0MVe+2UW/+4uE9pBjUwOIuA== From: Michael Tremer <michael.tremer@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 50/50] Config: Disable parallel builds for Cargo on riscv64 Date: Tue, 22 Feb 2022 12:51:35 +0000 Message-Id: <20220222125135.1211290-51-michael.tremer@ipfire.org> In-Reply-To: <20220222125135.1211290-1-michael.tremer@ipfire.org> References: <20220222125135.1211290-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Cc: Michael Tremer <michael.tremer@ipfire.org> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Series |
[01/50] expat: Update to version 2.4.6 - Security/CVE fixes
|
|
Commit Message
Michael Tremer
Feb. 22, 2022, 12:51 p.m. UTC
There seems to be some problem where Cargo deadlocks during the build
when running on mutliple cores simulteneously.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
lfs/Config | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
Comments
Whoops. I fucked this up. My next branch wasn’t up to date on this system and so I sent more patches than I should have. Could you please ignore the patches that are already in next and just merge the rest? -Michael > On 22 Feb 2022, at 12:51, Michael Tremer <michael.tremer@ipfire.org> wrote: > > There seems to be some problem where Cargo deadlocks during the build > when running on mutliple cores simulteneously. > > Signed-off-by: Michael Tremer <michael.tremer@ipfire.org> > --- > lfs/Config | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/lfs/Config b/lfs/Config > index 9309b832d..53f31ed63 100644 > --- a/lfs/Config > +++ b/lfs/Config > @@ -209,9 +209,15 @@ CARGO = \ > --offline > > CARGO_OPTIONS = \ > - $(MAKETUNING) \ > -Z avoid-dev-deps > > +# Cargo dealocks on riscv64 when building on multiple cores at the same time > +ifeq "$(BUILD_ARCH)" "riscv64" > + CARGO_OPTIONS += -j1 > +else > + CARGO_OPTIONS += $(MAKETUNING) > +endif > + > define CARGO_PREPARE > mkdir -p $(CARGO_PATH) && \ > echo "$${CARGO_CONFIG}" > $(CARGO_PATH)/config && \ > -- > 2.30.2 >
diff --git a/lfs/Config b/lfs/Config index 9309b832d..53f31ed63 100644 --- a/lfs/Config +++ b/lfs/Config @@ -209,9 +209,15 @@ CARGO = \ --offline CARGO_OPTIONS = \ - $(MAKETUNING) \ -Z avoid-dev-deps +# Cargo dealocks on riscv64 when building on multiple cores at the same time +ifeq "$(BUILD_ARCH)" "riscv64" + CARGO_OPTIONS += -j1 +else + CARGO_OPTIONS += $(MAKETUNING) +endif + define CARGO_PREPARE mkdir -p $(CARGO_PATH) && \ echo "$${CARGO_CONFIG}" > $(CARGO_PATH)/config && \