From nobody Thu May 25 09:44:08 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 4QRjn51wbWz4TGVS; Thu, 25 May 2023 09:44:09 +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 4QRjn5119Tz3l1m; Thu, 25 May 2023 09:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685007849; 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=vPL/w7S/8wwurs5sRwyyh+aM9Y3moFxf+TUITTRMngo=; b=jq/x8bBDOSYlkT5PZ6TAsYRgaD0Yyto4lGP5JqXldrL+sY+F8e8YYlnJr+7k3wW4qKFdwK jIaYUfojc+3tjs1FcPni1sx/N3BnoOyDiVSvaEhTY0/+R72U4l42bfuS3qIAr4YUB94U1L d538iRy/ugYgRcTYw5N2iedROlVu+s2wQExqKBf1YgneVM+3APa3slgF6TLYHD/BrFgKOL mJYAb6QtN+k0e5YVRLvfe6S/roaT7Xe3twRdbScXbnpEvmi9huwwl6ts/bPkKWZE2fDup8 9fw9Wc45RH2nn5H+fQ9ryEKrtvWI2UbHqtejbyzb/xPbiLO5NURpTeXbNn6USw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685007849; 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=vPL/w7S/8wwurs5sRwyyh+aM9Y3moFxf+TUITTRMngo=; b=I+rsrkHLXU0ihcroADL4eHnHtcHkDe1i5aFebkqMDnhlK7f5qLfLA5gl8odX4aOZd4zra8 acg2qWuvVTxCBKLT16wcz1LaTPZhdXAVPPnHGlTSju0B8BzhRmVAI3pMkVKVbQeQmylgxD YJ8ORVtlNFU5GyEPOr79Dlkvn7nvXyO5BvL0dViSW1qO2YQ5QmmDorFxPd80cDvRxStmsv JwAj8odmuD94l7bZ8I+sdc5bX5VEhT+skiO8Vnk0kN0aQud437muRhICqP5zcUf5Ft/deI S6w4zk6oBvPwZ0s845abnmp+LOJCmvnJTXcGVbvuxuFNigtohAso5UDa3ILX5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685007849; a=rsa-sha256; cv=none; b=n+SKzGR2cqkqPs3+/DLjqXoeNoTD80Sv2cANZNtnhPm4DXMBvkBjBL9sBeTqUqnnezzYAV JuzfOlD/niNQb2oUE4sc7KZWCzn+nub3Fx3RJO8vNMcPtwmxaasUqr9dMvJUcwlrZ1BSbB U07vQqJz2ChOWqvDyZfDhnhDMsrQ2sQncYJ5lycHa8BMSoHpH0XF/vgTh2R2h2PRzrcA0k B+MLcOsJ5xmsGxZtlgIGyEUEUoaLPo/I4XweYqmaaDJ6fqLJfa0CHlDBg+hf5nPJc70uGl q4PldSvmt6A3iTJOUdyl1yG55jnVg3btMoixeGDuiAH0/bDQIahWlMI3+LRl/g== 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 4QRjn46wj6zKLY; Thu, 25 May 2023 09:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34P9i8dw001285; Thu, 25 May 2023 09:44:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34P9i8bm001284; Thu, 25 May 2023 09:44:08 GMT (envelope-from git) Date: Thu, 25 May 2023 09:44:08 GMT Message-Id: <202305250944.34P9i8bm001284@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: a1fbebbcb6fc - main - sysutils/py-py-cpuinfo: fix on armv7, add lscpu dependency 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1fbebbcb6fc7439b6c01c63d2a39b1ee48e5246 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1fbebbcb6fc7439b6c01c63d2a39b1ee48e5246 commit a1fbebbcb6fc7439b6c01c63d2a39b1ee48e5246 Author: Robert Clausecker AuthorDate: 2023-05-24 07:33:43 +0000 Commit: Robert Clausecker CommitDate: 2023-05-25 09:39:34 +0000 sysutils/py-py-cpuinfo: fix on armv7, add lscpu dependency On FreeBSD, armv[67] both report "arm" in "uname -m", but this package expected the string armv6 or armv7. Fix the port by adding an extra case for just "arm" to the architecture detection logic. While we are at it, optionally depend on sysutils/lscpu as an additional data source for architecture features. See also: https://github.com/workhorsy/py-cpuinfo/issues/197 Approved by: yuri (maintainer) Differential Revision: https://reviews.freebsd.org/D40252 --- sysutils/py-py-cpuinfo/Makefile | 6 ++++++ sysutils/py-py-cpuinfo/files/patch-cpuinfo_cpuinfo.py | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/sysutils/py-py-cpuinfo/Makefile b/sysutils/py-py-cpuinfo/Makefile index 8293a493a925..628fe54b95ae 100644 --- a/sysutils/py-py-cpuinfo/Makefile +++ b/sysutils/py-py-cpuinfo/Makefile @@ -1,5 +1,6 @@ PORTNAME= py-cpuinfo DISTVERSION= 8.0.0 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,4 +17,9 @@ USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes +OPTIONS_DEFINE= LSCPU +OPTIONS_DEFAULT= LSCPU +LSCPU_DESC= Use sysutils/lscpu as a data source +LSCPU_RUN_DEPENDS= lscpu:sysutils/lscpu + .include diff --git a/sysutils/py-py-cpuinfo/files/patch-cpuinfo_cpuinfo.py b/sysutils/py-py-cpuinfo/files/patch-cpuinfo_cpuinfo.py new file mode 100644 index 000000000000..ffbfc56cbdb1 --- /dev/null +++ b/sysutils/py-py-cpuinfo/files/patch-cpuinfo_cpuinfo.py @@ -0,0 +1,11 @@ +--- cpuinfo/cpuinfo.py.orig 2023-05-24 07:26:57 UTC ++++ cpuinfo/cpuinfo.py +@@ -797,7 +797,7 @@ def _parse_arch(arch_string_raw): + elif re.match(r'^armv8-a|aarch64|arm64$', arch_string_raw): + arch = 'ARM_8' + bits = 64 +- elif re.match(r'^armv7$|^armv7[a-z]$|^armv7-[a-z]$|^armv6[a-z]$', arch_string_raw): ++ elif re.match(r'^armv7$|^armv7[a-z]$|^armv7-[a-z]$|^armv6[a-z]$|^arm$', arch_string_raw): + arch = 'ARM_7' + bits = 32 + elif re.match(r'^armv8$|^armv8[a-z]$|^armv8-[a-z]$', arch_string_raw):