From a1fbebbcb6fc7439b6c01c63d2a39b1ee48e5246 Mon Sep 17 00:00:00 2001 From: Robert Clausecker Date: Wed, 24 May 2023 09:33:43 +0200 Subject: 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/files/patch-cpuinfo_cpuinfo.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sysutils/py-py-cpuinfo/files/patch-cpuinfo_cpuinfo.py (limited to 'sysutils/py-py-cpuinfo/files/patch-cpuinfo_cpuinfo.py') 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): -- cgit v1.2.3