From 5a5b35419dc5229bc4ed093153e4284b81c47b13081a344bc5b683b171f216f4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 7 Mar 2013 06:34:02 +0000 Subject: [PATCH] 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 --- numpy-aarch64.patch | 21 +++++++++++++++++++++ python-numpy-doc.spec | 4 +++- python-numpy.changes | 6 ++++++ python-numpy.spec | 4 +++- python3-numpy.spec | 2 +- 5 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 numpy-aarch64.patch diff --git a/numpy-aarch64.patch b/numpy-aarch64.patch new file mode 100644 index 0000000..c1ce1d2 --- /dev/null +++ b/numpy-aarch64.patch @@ -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 diff --git a/python-numpy-doc.spec b/python-numpy-doc.spec index 5e8eced..5cf3499 100644 --- a/python-numpy-doc.spec +++ b/python-numpy-doc.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ License: BSD-3-Clause Group: Development/Libraries/Python Source: %{modname}-%{version}.tar.gz Patch1: numpy-buildfix.patch +Patch2: numpy-aarch64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: blas-devel BuildRequires: lapack-devel @@ -138,6 +139,7 @@ version is recommended over that included in Numpydoc. %prep %setup -q -n %{modname}-%{version} %patch1 -p0 +%patch2 -p0 %build # make the documentation diff --git a/python-numpy.changes b/python-numpy.changes index 1b9ffd9..50fa3e8 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -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 diff --git a/python-numpy.spec b/python-numpy.spec index 4a9ed87..8b13a13 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ License: BSD-3-Clause Group: Development/Libraries/Python Source: %{modname}-%{version}.tar.gz Patch1: numpy-buildfix.patch +Patch2: numpy-aarch64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: blas-devel BuildRequires: lapack-devel @@ -84,6 +85,7 @@ This package contains files for developing applications using %{modname}. %prep %setup -q -n %{modname}-%{version} %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 %build diff --git a/python3-numpy.spec b/python3-numpy.spec index da913fb..5a9524c 100644 --- a/python3-numpy.spec +++ b/python3-numpy.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed