rpms/python-blosc
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add patches to fix build on s390x and ppc64le

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-07-12 19:03:22 +02:00
commit 0b2db4436c
4 changed files with 150 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

38
0003-setup.py-catch-import-error-for-cpuinfo.patch Normal file
View file

@ -0,0 +1,38 @@
From 8c8cf1a2a09ba8b6b02be5a69bb8cbf5ff2a4838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 12 Jul 2019 18:54:36 +0200
Subject: [PATCH] setup.py: catch import error for cpuinfo
BUILDSTDERR: Traceback (most recent call last):
BUILDSTDERR: File "setup.py", line 112, in <module>
BUILDSTDERR: import cpuinfo
BUILDSTDERR: File "/usr/lib/python3.7/site-packages/cpuinfo/__init__.py", line 7, in <module>
BUILDSTDERR: from cpuinfo.cpuinfo import *
BUILDSTDERR: File "/usr/lib/python3.7/site-packages/cpuinfo/cpuinfo.py", line 2256, in <module>
BUILDSTDERR: _check_arch()
BUILDSTDERR: File "/usr/lib/python3.7/site-packages/cpuinfo/cpuinfo.py", line 231, in _check_arch
BUILDSTDERR: raise Exception("py-cpuinfo currently only works on X86 and some PPC and ARM CPUs.")
BUILDSTDERR: Exception: py-cpuinfo currently only works on X86 and some PPC and ARM CPUs.
---
setup.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
index 468b970588..2508a94fbe 100644
--- a/setup.py
+++ b/setup.py
@@ -109,8 +109,12 @@ if __name__ == '__main__':
with io.open('README.rst', encoding='utf-8') as f:
long_description = f.read()
- import cpuinfo
- cpu_info = cpuinfo.get_cpu_info()
+ try:
+ import cpuinfo
+ cpu_info = cpuinfo.get_cpu_info()
+ except Exception:
+ # newer cpuinfo versions fail to import on unsupported architectures
+ cpu_info = None
########### Check versions ##########
def exit_with_error(message):