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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2FD49138359 for ; Fri, 24 Jul 2020 12:03:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46C3AE0826; Fri, 24 Jul 2020 12:03:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D992E0826 for ; Fri, 24 Jul 2020 12:03:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABD6234F1CF for ; Fri, 24 Jul 2020 12:03:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 168F72EE for ; Fri, 24 Jul 2020 12:03:48 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1595592210.f29658991e1fd295f10bf26d7a1275eebc43befa.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/hpx/hpx-1.4.1.ebuild X-VCS-Directories: sys-cluster/hpx/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: f29658991e1fd295f10bf26d7a1275eebc43befa X-VCS-Branch: master Date: Fri, 24 Jul 2020 12:03:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d04bd8f4-fa39-4029-bea6-463241c47bbf X-Archives-Hash: ad708deb15dd16980552fe788a9f7459 commit: f29658991e1fd295f10bf26d7a1275eebc43befa Author: Kurt Kanzenbach kmk-computers de> AuthorDate: Sun Jul 12 14:18:09 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Jul 24 12:03:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2965899 sys-cluster/hpx: Fix memory requirement Instead of guessing the number of make jobs, better use the corresponding eclass to get it. Closes: https://bugs.gentoo.org/732274 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Kurt Kanzenbach kmk-computers.de> Signed-off-by: Joonas Niilola gentoo.org> sys-cluster/hpx/hpx-1.4.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/hpx/hpx-1.4.1.ebuild b/sys-cluster/hpx/hpx-1.4.1.ebuild index 964325329bb..7206bca4082 100644 --- a/sys-cluster/hpx/hpx-1.4.1.ebuild +++ b/sys-cluster/hpx/hpx-1.4.1.ebuild @@ -12,7 +12,7 @@ else SRC_URI="https://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi -inherit cmake fortran-2 python-single-r1 check-reqs +inherit cmake fortran-2 python-single-r1 check-reqs multiprocessing DESCRIPTION="C++ runtime system for parallel and distributed applications" HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/" @@ -65,7 +65,7 @@ hpx_memory_requirement() { if [[ -z ${MAKEOPTS} ]] ; then echo "2G" else - local jobs=`echo ${MAKEOPTS} | cut -d j -f 2` + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") echo "${jobs}G" fi }