From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BFFBB158089 for ; Wed, 4 Oct 2023 13:08:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D12B2BC0E6; Wed, 4 Oct 2023 13:07:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 388A62BC0E3 for ; Wed, 4 Oct 2023 13:07:21 +0000 (UTC) From: Florian Schmaus To: gentoo-dev@lists.gentoo.org, base-system@gentoo.org Cc: Florian Schmaus Subject: [gentoo-dev] [PATCH 2/3] ninja-utils.eclass: use get_makeopts_{jobs,loadavg} Date: Wed, 4 Oct 2023 15:06:39 +0200 Message-ID: <20231004130640.384070-3-flow@gentoo.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004130640.384070-1-flow@gentoo.org> References: <20231004130640.384070-1-flow@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 5f0821bf-8896-465f-82d9-4349db1bc3eb X-Archives-Hash: b089d250c9b6949b05546db4605d9ace Signed-off-by: Florian Schmaus --- eclass/ninja-utils.eclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass index 5a211e81131d..1af3df9f71e5 100644 --- a/eclass/ninja-utils.eclass +++ b/eclass/ninja-utils.eclass @@ -1,3 +1,4 @@ + # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 @@ -72,7 +73,7 @@ esac # Get the value of NINJAOPTS, inferring them from MAKEOPTS if unset. get_NINJAOPTS() { if [[ -z ${NINJAOPTS+set} ]]; then - NINJAOPTS="-j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0)" + NINJAOPTS="-j$(get_makeopts_jobs 999) -l$(get_makeopts_loadavg 0)" fi echo "${NINJAOPTS}" } -- 2.41.0