Accepting request 576265 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/576265
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=66
This commit is contained in:
Dominique Leuenberger 2018-02-16 20:40:19 +00:00 committed by Git OBS Bridge
parent 17a9f05a74
commit 39280035c5
3 changed files with 35 additions and 4 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Feb 13 10:09:18 UTC 2018 - schwab@suse.de
- riscv.patch: Add support for RISC-V
- Don't use openblas on m68k and riscv64
- Avoid misparsing of indented conditionals
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 9 14:28:43 UTC 2018 - cgoll@suse.com Fri Feb 9 14:28:43 UTC 2018 - cgoll@suse.com

View File

@ -32,7 +32,7 @@ ExclusiveArch: do_not_build
%if "%flavor" == "standard" %if "%flavor" == "standard"
%bcond_with hpc %bcond_with hpc
%ifarch armv6l s390 s390x %ifarch armv6l s390 s390x m68k riscv64
%bcond_with openblas %bcond_with openblas
%else %else
%bcond_without openblas %bcond_without openblas
@ -84,6 +84,8 @@ Source: https://pypi.io/packages/source/n/numpy/numpy-%{version}.zip
Patch0: numpy-buildfix.patch Patch0: numpy-buildfix.patch
# PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure # PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure
Patch1: numpy-1.9.0-remove-__declspec.patch Patch1: numpy-1.9.0-remove-__declspec.patch
# PATCH-FIX-UPSTREAM riscv.patch -- Add support for RISC-V
Patch2: riscv.patch
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: fdupes BuildRequires: fdupes
%endif %endif
@ -136,12 +138,12 @@ Group: Development/Libraries/Python
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: python-devel Requires: python-devel
%if %{without hpc} %if %{without hpc}
%if %{with openblas} %if %{with openblas}
Requires: openblas-devel Requires: openblas-devel
%else %else
Requires: blas-devel Requires: blas-devel
Requires: lapack-devel Requires: lapack-devel
%endif %endif
%else %else
Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
%hpc_requires_devel %hpc_requires_devel
@ -156,6 +158,7 @@ This package contains files for developing applications using numpy.
%setup -q -n numpy-%{version} %setup -q -n numpy-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
# Fix non-executable scripts # Fix non-executable scripts
sed -i '1s/^#!.*$//' numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py sed -i '1s/^#!.*$//' numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py

21
riscv.patch Normal file
View File

@ -0,0 +1,21 @@
Index: numpy-1.14.0/numpy/core/include/numpy/npy_cpu.h
===================================================================
--- numpy-1.14.0.orig/numpy/core/include/numpy/npy_cpu.h
+++ numpy-1.14.0/numpy/core/include/numpy/npy_cpu.h
@@ -17,6 +17,7 @@
* NPY_CPU_SH_BE
* NPY_CPU_ARCEL
* NPY_CPU_ARCEB
+ * NPY_CPU_RISCV
*/
#ifndef _NPY_CPUARCH_H_
#define _NPY_CPUARCH_H_
@@ -82,6 +83,8 @@
#define NPY_CPU_ARCEL
#elif defined(__arc__) && defined(__BIG_ENDIAN__)
#define NPY_CPU_ARCEB
+#elif defined(__riscv)
+ #define NPY_CPU_RISCV
#else
#error Unknown CPU, please report this to numpy maintainers with \
information about your platform (OS, CPU and compiler)