From patchwork Sun Mar 28 18:40:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 3991 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 ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4F7l0P4zFsz3wp0 for ; Sun, 28 Mar 2021 18:41:09 +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 4F7l0N3jVNz1G1; Sun, 28 Mar 2021 18:41:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4F7l0N2dTLz30PR; Sun, 28 Mar 2021 18:41:08 +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 4F7l0M6tS5z2xbv for ; Sun, 28 Mar 2021 18:41:07 +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 4F7l0M2rb6zBC; Sun, 28 Mar 2021 18:41:07 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1616956867; 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=5QPIXwz61nF1hBfpf0cFt9WK0tHvD0hLyr7ceJ6BsBw=; b=T6j1LvHHA0W1i2Kk4gOvXmBtqF9LIiBtITqVsjRoj319I0efZJzatpHPDvVpGdtsOg4MxJ 9OWPhyMPuIRYguDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1616956867; 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=5QPIXwz61nF1hBfpf0cFt9WK0tHvD0hLyr7ceJ6BsBw=; b=eG1vXUuH2Q3GgH6PrJktQScM3xbdXdie2qB5mB3kQ0lbpoFLUhNPkjH2ulMJKXn4QORceR stqRS50DPuorIdkizkQHT9nsj+eDXTLTLls7TrLOpXAtlMXx1L2XClJKwXHbzBzgKAIVML c9pQ5sRyt2uFVw54WZ+MEfes7JJlNOjzXcr22nnBzM6jmXSdpYsmA/YKYmt8jwD/yxz6ku 69ZgSqEbH20VPJ+Gv/Qj1pOPTCpwlXWM+1lHtdybvpfGoi+vH/AmzHdoNqaNFB3VS/cDHx kIRLXJWAdi5PADTmdQcMskybG4R/LStceTXchcPsxJChFJue5klLA1a3d6UMsw== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] lfs/Config: fix build if MAX_PARALLELISM is lower than one Date: Sun, 28 Mar 2021 20:40:34 +0200 Message-Id: <20210328184034.1591-1-arne_f@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: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" If you have 2GB RAM the build of dnsdist will fail because MAX_PARALLELISM was set to zero by RAM/2048 because a bit of RAM is used by the system. This patch ensure that the lowest PARALLELISM value is 1. Signed-off-by: Arne Fitzenreiter --- lfs/Config | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lfs/Config b/lfs/Config index ee3dc2365..4e3ddb880 100644 --- a/lfs/Config +++ b/lfs/Config @@ -35,11 +35,15 @@ unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR unexport XZ_OPT PARALLELISM = $(shell echo $$( \ - if [ -n "$(MAX_PARALLELISM)" ] && [ $(MAX_PARALLELISM) -lt $(DEFAULT_PARALLELISM) ]; then \ - echo $(MAX_PARALLELISM); \ + if [ -n "$(MAX_PARALLELISM)" ] && [ $(MAX_PARALLELISM) -lt 1 ]; then \ + echo 1 ; \ else \ - echo $(DEFAULT_PARALLELISM); \ - fi) \ + if [ -n "$(MAX_PARALLELISM)" ] && [ $(MAX_PARALLELISM) -lt $(DEFAULT_PARALLELISM) ]; then \ + echo $(MAX_PARALLELISM); \ + else \ + echo $(DEFAULT_PARALLELISM); \ + fi \ + fi ) \ ) MAKETUNING = -j$(PARALLELISM)