Accepting request 157542 from devel:languages:python

- add numpy-aarch64.diff:
  * Fix build for AArch64 (forwarded request 157435 from dirkmueller)

OBS-URL: https://build.opensuse.org/request/show/157542
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=29
This commit is contained in:
Stephan Kulow 2013-03-07 06:34:02 +00:00 committed by Git OBS Bridge
parent 9512ffddf4
commit 5a5b35419d
5 changed files with 34 additions and 3 deletions

21
numpy-aarch64.patch Normal file
View File

@ -0,0 +1,21 @@
--- numpy/core/include/numpy/npy_cpu.h
+++ numpy/core/include/numpy/npy_cpu.h
@@ -66,6 +66,8 @@
#define NPY_CPU_MIPSEL
#elif defined(__MIPSEB__)
#define NPY_CPU_MIPSEB
+#elif defined(__aarch64__)
+ #define NPY_CPU_AARCH64
#else
#error Unknown CPU, please report this to numpy maintainers with \
information about your platform (OS, CPU and compiler)
--- numpy/core/include/numpy/npy_endian.h
+++ numpy/core/include/numpy/npy_endian.h
@@ -25,6 +25,7 @@
|| defined(NPY_CPU_IA64) \
|| defined(NPY_CPU_ALPHA) \
|| defined(NPY_CPU_ARMEL) \
+ || defined(NPY_CPU_AARCH64) \
|| defined(NPY_CPU_SH_LE) \
|| defined(NPY_CPU_MIPSEL)
#define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN

View File

@ -1,7 +1,7 @@
# #
# spec file for package python-numpy-doc # spec file for package python-numpy-doc
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -28,6 +28,7 @@ License: BSD-3-Clause
Group: Development/Libraries/Python Group: Development/Libraries/Python
Source: %{modname}-%{version}.tar.gz Source: %{modname}-%{version}.tar.gz
Patch1: numpy-buildfix.patch Patch1: numpy-buildfix.patch
Patch2: numpy-aarch64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: blas-devel BuildRequires: blas-devel
BuildRequires: lapack-devel BuildRequires: lapack-devel
@ -138,6 +139,7 @@ version is recommended over that included in Numpydoc.
%prep %prep
%setup -q -n %{modname}-%{version} %setup -q -n %{modname}-%{version}
%patch1 -p0 %patch1 -p0
%patch2 -p0
%build %build
# make the documentation # make the documentation

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 5 22:25:53 UTC 2013 - dmueller@suse.com
- add numpy-aarch64.diff:
* Fix build for AArch64
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 17 08:20:36 UTC 2012 - toddrme2178@gmail.com Fri Aug 17 08:20:36 UTC 2012 - toddrme2178@gmail.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package python-numpy # spec file for package python-numpy
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -26,6 +26,7 @@ License: BSD-3-Clause
Group: Development/Libraries/Python Group: Development/Libraries/Python
Source: %{modname}-%{version}.tar.gz Source: %{modname}-%{version}.tar.gz
Patch1: numpy-buildfix.patch Patch1: numpy-buildfix.patch
Patch2: numpy-aarch64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: blas-devel BuildRequires: blas-devel
BuildRequires: lapack-devel BuildRequires: lapack-devel
@ -84,6 +85,7 @@ This package contains files for developing applications using %{modname}.
%prep %prep
%setup -q -n %{modname}-%{version} %setup -q -n %{modname}-%{version}
%patch1 -p0 %patch1 -p0
%patch2
sed -i "1d" %{modname}/{compat/setup{,scons},distutils/{conv_template,cpuinfo,exec_command,from_template,setup,setupscons,system_info},f2py/{auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,docs/usersguide/setup_example,f2py2e,f90mod_rules,func2subr,__init__,rules,setup,setupscons,use_rules},ma/setup{,scons},matrixlib/setup{,scons},setup,setupscons,testing/print_coercion_tables,testing/setup{,scons}}.py # Fix non-executable scripts sed -i "1d" %{modname}/{compat/setup{,scons},distutils/{conv_template,cpuinfo,exec_command,from_template,setup,setupscons,system_info},f2py/{auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,docs/usersguide/setup_example,f2py2e,f90mod_rules,func2subr,__init__,rules,setup,setupscons,use_rules},ma/setup{,scons},matrixlib/setup{,scons},setup,setupscons,testing/print_coercion_tables,testing/setup{,scons}}.py # Fix non-executable scripts
%build %build

View File

@ -1,7 +1,7 @@
# #
# spec file for package python3-numpy # spec file for package python3-numpy
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed