xarthisius 10/08/03 13:40:45
Added: scipy-0.8.0-python2.7.patch
scipy-0.7.2-python2.7.patch
Log:
Apply upstream patches to fix build with python2.7. Fixes bug 321587
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.1 sci-libs/scipy/files/scipy-0.8.0-python2.7.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/files/scipy-0.8.0-python2.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/files/scipy-0.8.0-python2.7.patch?rev=1.1&content-type=text/plain
Index: scipy-0.8.0-python2.7.patch
===================================================================
http://projects.scipy.org/scipy/changeset/6646
--- scipy/sparse/sparsetools/setup.py
+++ scipy/sparse/sparsetools/setup.py
@@ -9,7 +9,9 @@
for fmt in ['csr','csc','coo','bsr','dia']:
sources = [ fmt + '_wrap.cxx' ]
depends = [ fmt + '.h' ]
- config.add_extension('_' + fmt, sources=sources, depends=depends)
+ config.add_extension('_' + fmt, sources=sources,
+ define_macros=[('__STDC_FORMAT_MACROS', 1)],
+ depends=depends)
return config
--- scipy/sparse/sparsetools/SConscript
+++ 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' ]
1.1 sci-libs/scipy/files/scipy-0.7.2-python2.7.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/files/scipy-0.7.2-python2.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/files/scipy-0.7.2-python2.7.patch?rev=1.1&content-type=text/plain
Index: scipy-0.7.2-python2.7.patch
===================================================================
http://projects.scipy.org/scipy/changeset/6645
--- scipy/sparse/sparsetools/setup.py
+++ scipy/sparse/sparsetools/setup.py
@@ -8,7 +8,10 @@
for fmt in ['csr','csc','coo','bsr','dia']:
sources = [ fmt + '_wrap.cxx' ]
- config.add_extension('_' + fmt, sources=sources)
+ depends = [ fmt + '.h' ]
+ config.add_extension('_' + fmt, sources=sources,
+ define_macros=[('__STDC_FORMAT_MACROS', 1)],
+ depends=depends)
return config
--- scipy/sparse/sparsetools/SConscript
+++ 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' ]
|
