diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-08-03 13:40:45 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-08-03 13:40:45 +0000 |
| commit | 3fdcea882e119fd549710a8e756cd9dd535051ce (patch) | |
| tree | 68a2e5c96be18de8487ee0c1de1556df1cac3077 /sci-libs/scipy/files | |
| parent | updated patchset to keep patches in sync for next release thursday (diff) | |
| download | historical-3fdcea882e119fd549710a8e756cd9dd535051ce.tar.gz historical-3fdcea882e119fd549710a8e756cd9dd535051ce.tar.bz2 historical-3fdcea882e119fd549710a8e756cd9dd535051ce.zip | |
Apply upstream patches to fix build with python2.7. Fixes bug 321587
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/scipy/files')
| -rw-r--r-- | sci-libs/scipy/files/scipy-0.7.2-python2.7.patch | 26 | ||||
| -rw-r--r-- | sci-libs/scipy/files/scipy-0.8.0-python2.7.patch | 25 |
2 files changed, 51 insertions, 0 deletions
diff --git a/sci-libs/scipy/files/scipy-0.7.2-python2.7.patch b/sci-libs/scipy/files/scipy-0.7.2-python2.7.patch new file mode 100644 index 000000000000..13dbd4caaef3 --- /dev/null +++ b/sci-libs/scipy/files/scipy-0.7.2-python2.7.patch @@ -0,0 +1,26 @@ +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' ] diff --git a/sci-libs/scipy/files/scipy-0.8.0-python2.7.patch b/sci-libs/scipy/files/scipy-0.8.0-python2.7.patch new file mode 100644 index 000000000000..e6933f0cf18b --- /dev/null +++ b/sci-libs/scipy/files/scipy-0.8.0-python2.7.patch @@ -0,0 +1,25 @@ +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' ] |