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 B294E138334 for ; Sat, 21 Dec 2019 09:14:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BC31E086C; Sat, 21 Dec 2019 09:14:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 7C6FAE086C for ; Sat, 21 Dec 2019 09:14:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 663D334D4D8 for ; Sat, 21 Dec 2019 09:14:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBF20906 for ; Sat, 21 Dec 2019 09:14:29 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1576919666.c75df64900c81f3445b2789d7337b81ccd41d076.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.16.2-r1.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c75df64900c81f3445b2789d7337b81ccd41d076 X-VCS-Branch: master Date: Sat, 21 Dec 2019 09:14:29 +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: f56c3652-7fd0-4a08-9816-de1e25f15933 X-Archives-Hash: 682ede225aef3dcf46f2bbfef2a24a58 commit: c75df64900c81f3445b2789d7337b81ccd41d076 Author: Michał Górny gentoo org> AuthorDate: Fri Dec 20 21:55:46 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Dec 21 09:14:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75df649 dev-util/cmake: Reuse makeopts_jobs in bootstrap command Closes: https://github.com/gentoo/gentoo/pull/14068 Signed-off-by: Michał Górny gentoo.org> dev-util/cmake/cmake-3.16.2-r1.ebuild | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dev-util/cmake/cmake-3.16.2-r1.ebuild b/dev-util/cmake/cmake-3.16.2-r1.ebuild index 6881bf5721c..061e5b7f8ed 100644 --- a/dev-util/cmake/cmake-3.16.2-r1.ebuild +++ b/dev-util/cmake/cmake-3.16.2-r1.ebuild @@ -5,7 +5,8 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils +inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \ + toolchain-funcs virtualx xdg cmake-utils MY_P="${P/_/-}" @@ -69,16 +70,6 @@ PATCHES=( ) cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null - if [[ $? -eq 0 ]] ; then - par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - # disable running of cmake in boostrap command sed -i \ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ @@ -95,7 +86,7 @@ cmake_src_bootstrap() { # bootstrap script isn't exactly /bin/sh compatible ${CONFIG_SHELL:-sh} ./bootstrap \ --prefix="${T}/cmakestrap/" \ - ${par_arg} \ + --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ || die "Bootstrap failed" }