From nobody Mon Dec 25 09:11:37 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzBwn47sZz54M8X; Mon, 25 Dec 2023 09:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzBwn1XjRz3djl; Mon, 25 Dec 2023 09:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703495497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Efv6PIIDjsN03zeXs0nZGOGJGAVWrNydiW/CDRwa+kI=; b=pVAXc6nicgui458YTc5VGluq51E8XgqVmPXKpqLQ9s9itMlcLHeqL2jGva85wmlXuydf6j NN0Ta7k1z20ke0X83Ux0vQwmHscQt/c569MMb1X4n+1UmhyWczckMI87eYhnvq+RWWd6UR c8t2K5KW00HMpSy/gu3Smsku/TaEVfEtEZjm0U9TwT1tM3AomdjpwVggkT5qd21uPlKMOK wp5XnaHhBbkvMI73PKJNO/RD2/z4rgQBsQb9avxvECElPLe9clDNlpI/LiKPzC1GiEi0PC wv36uVb1bzOTkbKI0d+3jikkK8m5mXVXBSy2qDa56q2/ie+P6i05ZYTB01hKKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703495497; a=rsa-sha256; cv=none; b=vuCNlnpzA8YXMVUYmJv2pEaS9cDV8Iw1xeSrwpfxMm2zCwqz4oJ6WuXVCCS+l4acp7qVJ3 rAlrWSOljS3PaAQbh0LGyu0VM7XisAAn9tS5N/d1s605Kdq8UkLlIcVhSga2odXo616jPY 7EyFHR+BpHgw7px3EMOiempTCRQTMlId5iFwp016SgvceEBd+BUAzgo8fRCPZICubeskr6 ScORySNqDNbTemV0KCFQmEEJwMjjHM1guMM8keX810SRO1Zpo00H/otUA8BWtEmc8xJKJ+ eW0yO2QTy1Ib+qHxK0UHByaj7qFNeXFvr1CfFn0/CywOMB5EFZIs4W8uqZgveg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703495497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Efv6PIIDjsN03zeXs0nZGOGJGAVWrNydiW/CDRwa+kI=; b=wvE1mj86aVZcU3Cv2K1lBhmB3mdS9vsyRdLFpVOMHuxUI92Mr4z18ziNDVnMoV6HxjQ57w f932+nMrL3tOTHZStOqAu5wKMG2D2cNHKDaFQ/XTFtgZAIYcz1H+doVGQPFpJlmUfTcici 40nSvZ47D9FNdtWpvyDEkCyvuh9NDSLU+nPA860X8y9cSsbECBwH4nnj0Y8mFdFmjhm/hU 7XeiH2v4Eu8knPWF+CwawPyh+H7Idq+fCwmeG+ibJKuA6umH1XlVTTRQA95N0KSyyn5jtD xRKvL4mV7JTtxLa/2vZP0ezpAHK4pJyJDAKj8xZXqroJsYeVksLRutWxAWJQnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzBwn0fZ3z14xH; Mon, 25 Dec 2023 09:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BP9BbZU086787; Mon, 25 Dec 2023 09:11:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BP9BbkJ086784; Mon, 25 Dec 2023 09:11:37 GMT (envelope-from git) Date: Mon, 25 Dec 2023 09:11:37 GMT Message-Id: <202312250911.3BP9BbkJ086784@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: aa469725eb9a - main - sysutils/parallel: Fix --number-of-cores List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa469725eb9acf665d738ca24ce02730a459eddb Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa469725eb9acf665d738ca24ce02730a459eddb commit aa469725eb9acf665d738ca24ce02730a459eddb Author: Po-Chuan Hsieh AuthorDate: 2023-12-25 09:03:07 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-25 09:03:07 +0000 sysutils/parallel: Fix --number-of-cores - Bump PORTREVISION for package change PR: 268011 Reported by: jwb --- sysutils/parallel/Makefile | 1 + sysutils/parallel/files/patch-src-parallel | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/sysutils/parallel/Makefile b/sysutils/parallel/Makefile index f909c0ad9a57..c82ffddc26e6 100644 --- a/sysutils/parallel/Makefile +++ b/sysutils/parallel/Makefile @@ -1,5 +1,6 @@ PORTNAME= parallel PORTVERSION= 20231122 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= GNU diff --git a/sysutils/parallel/files/patch-src-parallel b/sysutils/parallel/files/patch-src-parallel new file mode 100644 index 000000000000..b0a1e33b811b --- /dev/null +++ b/sysutils/parallel/files/patch-src-parallel @@ -0,0 +1,18 @@ +--- src/parallel.orig 2023-11-23 00:27:43 UTC ++++ src/parallel +@@ -8704,13 +8704,9 @@ sub sct_freebsd($) { + local $/ = "\n"; + my $cpu = shift; + $cpu->{'cores'} ||= +- (::qqx(qq{ sysctl -a dev.cpu | grep \%parent | awk '{ print \$2 }' | uniq | wc -l | awk '{ print \$1 }' }) +- or +- ::qqx(qq{ sysctl hw.ncpu | awk '{ print \$2 }' })); ++ ::qqx(qq{ sysctl kern.smp.cores | awk '{ print \$2 }' }); + $cpu->{'threads'} ||= +- (::qqx(qq{ sysctl hw.ncpu | awk '{ print \$2 }' }) +- or +- ::qqx(qq{ sysctl -a dev.cpu | grep \%parent | awk '{ print \$2 }' | uniq | wc -l | awk '{ print \$1 }' })); ++ ::qqx(qq{ sysctl kern.smp.cpus | awk '{ print \$2 }' }); + return $cpu; + } +