diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2011-10-09 05:54:38 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2011-10-09 05:54:38 +0000 |
| commit | 9c579740c2a639a8daa0e4cf8541e878ab069b7b (patch) | |
| tree | a438db1fadaadc2eda3355dccd6a9eca9b7efc3f /math/py-numpy/files/patch-numpy-distutils-system_info.py | |
| parent | Unbreak for non-i386. (diff) | |
- Update math/py-numpy to reflect changes in math/atlas
- Bump PORTREVISION
- Fix build for science/py-scipy
PR: ports/161400
Submitted by: Li-Lun Wang <llwang at infor.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=283234
Diffstat (limited to 'math/py-numpy/files/patch-numpy-distutils-system_info.py')
| -rw-r--r-- | math/py-numpy/files/patch-numpy-distutils-system_info.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/math/py-numpy/files/patch-numpy-distutils-system_info.py b/math/py-numpy/files/patch-numpy-distutils-system_info.py index 21e4f924f518..6b8841e0183c 100644 --- a/math/py-numpy/files/patch-numpy-distutils-system_info.py +++ b/math/py-numpy/files/patch-numpy-distutils-system_info.py @@ -1,6 +1,17 @@ ---- numpy/distutils/system_info.py.orig 2007-11-07 16:05:15.000000000 -0600 -+++ numpy/distutils/system_info.py 2008-04-07 11:39:05.000000000 -0500 -@@ -883,6 +883,7 @@ +--- numpy/distutils/system_info.py.orig 2010-11-18 05:11:51.000000000 -0600 ++++ numpy/distutils/system_info.py 2011-10-08 11:34:44.399179056 -0500 +@@ -909,8 +909,8 @@ + dir_env_var = 'ATLAS' + _lib_names = ['f77blas','cblas'] + if sys.platform[:7]=='freebsd': +- _lib_atlas = ['atlas_r'] +- _lib_lapack = ['alapack_r'] ++ _lib_atlas = ['atlas'] ++ _lib_lapack = ['alapack'] + else: + _lib_atlas = ['atlas'] + _lib_lapack = ['lapack'] +@@ -938,6 +938,7 @@ atlas = self.check_libs2(d,atlas_libs,[]) lapack_atlas = self.check_libs2(d,['lapack_atlas'],[]) if atlas is not None: @@ -8,7 +19,7 @@ lib_dirs2 = [d] + self.combine_paths(d,['atlas*','ATLAS*']) for d2 in lib_dirs2: lapack = self.check_libs2(d2,lapack_libs,[]) -@@ -1324,8 +1325,9 @@ +@@ -1383,8 +1384,9 @@ atlas_info = get_info('atlas_blas') atlas_version = None need_blas = 0 @@ -18,4 +29,4 @@ + if lapack_type == 'atlas' and atlas_info: version_info = atlas_info.copy() atlas_version = get_atlas_version(**version_info) - if not atlas_info.has_key('define_macros'): + if 'define_macros' not in atlas_info:
\ No newline at end of file |