Remove fortran flags or arm would build with -march=x86-64

This commit is contained in:
Thomas Spura 2015-10-14 21:48:03 +02:00
parent 46662ff0a1
commit 5e67eba0e5
2 changed files with 17 additions and 1 deletions

View File

@ -0,0 +1,11 @@
--- numpy-1.10.1/numpy/distutils/fcompiler/gnu.py 2015-10-14 21:43:39.834732663 +0200
+++ numpy-1.10.1/numpy/distutils/fcompiler/gnu.py.orig 2015-10-14 21:42:31.346540506 +0200
@@ -218,7 +218,7 @@
opt = ['-O2 -march=core2 -mtune=generic -mfpmath=sse -msse2 '
'-mincoming-stack-boundary=2']
else:
- opt = ['-O2']
+ opt = ['-O2 -march=x86-64 -DMS_WIN64 -mtune=generic -msse2']
else:
opt = ['-O2']

View File

@ -12,7 +12,7 @@
Name: numpy
Version: 1.10.1
Release: 2%{?relc}%{?dist}
Release: 3%{?relc}%{?dist}
Epoch: 1
Summary: A fast multidimensional array facility for Python
@ -21,6 +21,7 @@ Group: Development/Languages
License: BSD and Python
URL: http://www.numpy.org/
Source0: http://downloads.sourceforge.net/numpy/%{name}-%{version}%{?relc}.tar.gz
Patch0: numpy-1.10.1-remove-opt-flags.patch
BuildRequires: python2-devel lapack-devel python-setuptools gcc-gfortran atlas-devel python-nose
BuildRequires: Cython
@ -109,6 +110,7 @@ This package includes a version of f2py that works properly with NumPy.
%prep
%setup -q -n %{name}-%{version}%{?relc}
%patch0 -R -p1
# workaround for rhbz#849713
# http://mail.scipy.org/pipermail/numpy-discussion/2012-July/063530.html
@ -251,6 +253,9 @@ popd &> /dev/null
%changelog
* Wed Oct 14 2015 Thomas Spura <tomspur@fedoraproject.org> - 1:1.10.1-3
- Remove fortran flags or arm would build with -march=x86-64
* Wed Oct 14 2015 Thomas Spura <tomspur@fedoraproject.org> - 1:1.10.1-2
- Provide python2-* packages
- Run tests with verbose=2