Fix scipy build

This commit is contained in:
Toshio Kuratomi 2010-07-31 11:59:56 -04:00
parent ea9002fdcc
commit 617a6d6ca1
2 changed files with 33 additions and 0 deletions

27
scipy-py27-backport.patch Normal file
View File

@ -0,0 +1,27 @@
Index: scipy-0.7.2/scipy/sparse/sparsetools/SConscript
===================================================================
--- scipy-0.7.2.orig/scipy/sparse/sparsetools/SConscript
+++ scipy-0.7.2/scipy/sparse/sparsetools/SConscript
@@ -3,6 +3,7 @@
from numscons import GetNumpyEnvironment
env = GetNumpyEnvironment(ARGUMENTS)
+env.PrependUnique(CPPDEFINES = '__STDC_FORMAT_MACROS')
for fmt in ['csr','csc','coo','bsr','dia']:
sources = [ fmt + '_wrap.cxx' ]
Index: scipy-0.7.2/scipy/sparse/sparsetools/setup.py
===================================================================
--- scipy-0.7.2.orig/scipy/sparse/sparsetools/setup.py
+++ scipy-0.7.2/scipy/sparse/sparsetools/setup.py
@@ -8,7 +8,9 @@ def configuration(parent_package='',top_
for fmt in ['csr','csc','coo','bsr','dia']:
sources = [ fmt + '_wrap.cxx' ]
- config.add_extension('_' + fmt, sources=sources)
+ config.add_extension('_' + fmt, sources=sources,
+ define_macros=[('__STDC_FORMAT_MACROS', 1)],
+ )
return config

View File

@ -14,6 +14,8 @@ Source1: stsci_image_setup.py
Source2: stsci_convolve_setup.py Source2: stsci_convolve_setup.py
Patch0: stsci_image_syntax.patch Patch0: stsci_image_syntax.patch
Patch1: scipy_gcc43.patch Patch1: scipy_gcc43.patch
# Backport of python-2.7 build fixes upstream
Patch2: scipy-py27-backport.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: numpy, python-devel,f2py BuildRequires: numpy, python-devel,f2py
@ -39,6 +41,7 @@ leading scientists and engineers.
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p0 %patch0 -p0
%patch1 -p1 %patch1 -p1
%patch2 -p1
cat > site.cfg << EOF cat > site.cfg << EOF
[amd] [amd]
library_dirs = %{_libdir} library_dirs = %{_libdir}
@ -76,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Jul 31 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.7.2-3
- Fix scipy build on python-2.7
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.7.2-2 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild