From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH 50/50] Config: Disable parallel builds for Cargo on riscv64
Date: Tue, 22 Feb 2022 12:54:59 +0000
Message-ID: <42C9CA5F-0B8B-48D6-8268-ABC77E9FC607@ipfire.org>
In-Reply-To: <20220222125135.1211290-51-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5828798955990741234=="
List-Id: <development.lists.ipfire.org>

--===============5828798955990741234==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Whoops. I fucked this up.

My next branch wasn=E2=80=99t up to date on this system and so I sent more pa=
tches than I should have.

Could you please ignore the patches that are already in next and just merge t=
he rest?

-Michael

> On 22 Feb 2022, at 12:51, Michael Tremer <michael.tremer(a)ipfire.org> wrot=
e:
>=20
> There seems to be some problem where Cargo deadlocks during the build
> when running on mutliple cores simulteneously.
>=20
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
> lfs/Config | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>=20
> diff --git a/lfs/Config b/lfs/Config
> index 9309b832d..53f31ed63 100644
> --- a/lfs/Config
> +++ b/lfs/Config
> @@ -209,9 +209,15 @@ CARGO =3D \
> 	--offline
>=20
> CARGO_OPTIONS =3D \
> -	$(MAKETUNING) \
> 	-Z avoid-dev-deps
>=20
> +# Cargo dealocks on riscv64 when building on multiple cores at the same ti=
me
> +ifeq "$(BUILD_ARCH)" "riscv64"
> +	CARGO_OPTIONS +=3D -j1
> +else
> +	CARGO_OPTIONS +=3D $(MAKETUNING)
> +endif
> +
> define CARGO_PREPARE
> 	mkdir -p $(CARGO_PATH) && \
> 	echo "$${CARGO_CONFIG}" > $(CARGO_PATH)/config && \
> --=20
> 2.30.2
>=20


--===============5828798955990741234==--