From 39280035c543190e8ca05cbe3fb254cb2771f8624cc276ad014c85483f2580ec Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Fri, 16 Feb 2018 20:40:19 +0000
Subject: [PATCH] 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
---
 python-numpy.changes |  7 +++++++
 python-numpy.spec    | 11 +++++++----
 riscv.patch          | 21 +++++++++++++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 riscv.patch

diff --git a/python-numpy.changes b/python-numpy.changes
index 141549a..4ba6da1 100644
--- a/python-numpy.changes
+++ b/python-numpy.changes
@@ -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
 
diff --git a/python-numpy.spec b/python-numpy.spec
index d05f8ef..2490246 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -32,7 +32,7 @@ ExclusiveArch:  do_not_build
 
 %if "%flavor" == "standard"
  %bcond_with hpc
- %ifarch armv6l s390 s390x
+ %ifarch armv6l s390 s390x m68k riscv64
   %bcond_with openblas
  %else
   %bcond_without openblas
@@ -84,6 +84,8 @@ Source:         https://pypi.io/packages/source/n/numpy/numpy-%{version}.zip
 Patch0:         numpy-buildfix.patch
 # 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
+# PATCH-FIX-UPSTREAM riscv.patch -- Add support for RISC-V
+Patch2:         riscv.patch
 %if 0%{?suse_version}
 BuildRequires:  fdupes
 %endif
@@ -136,12 +138,12 @@ Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
 Requires:       python-devel
 %if %{without hpc}
- %if %{with openblas}
+%if %{with openblas}
 Requires:       openblas-devel
- %else
+%else
 Requires:       blas-devel
 Requires:       lapack-devel
- %endif
+%endif
 %else
 Requires:       libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
 %hpc_requires_devel
@@ -156,6 +158,7 @@ This package contains files for developing applications using numpy.
 %setup -q -n numpy-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # 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
 
diff --git a/riscv.patch b/riscv.patch
new file mode 100644
index 0000000..d4e123c
--- /dev/null
+++ b/riscv.patch
@@ -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)