diff options
| author | Wen Heping <wen@FreeBSD.org> | 2011-12-09 08:01:13 +0000 |
|---|---|---|
| committer | Wen Heping <wen@FreeBSD.org> | 2011-12-09 08:01:13 +0000 |
| commit | eac732e354288e715ad721265155bdca5307cb54 (patch) | |
| tree | dcc7aa26b80bdac61c87b2eb14b2b1e62b514238 /math/py-numpy/files/patch-numpy-distutils-system_info.py | |
| parent | - Update to 1.7.3 (diff) | |
- Update to 1.6.1
PR: 162894
Submitted by: Gereon Kaiping <kta1c10!gereon@linta.de>
Approved by: "Li-Lun Leland Wang" <llwang@infor.org> (maintainer)
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=287099
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 | 19 |
1 files changed, 4 insertions, 15 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 6b8841e0183c..8f3279bb63ee 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,6 @@ ---- 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 @@ +--- numpy/distutils/system_info.py.orig 2011-07-01 22:31:13.000000000 +0100 ++++ numpy/distutils/system_info.py 2011-11-26 09:54:54.000000000 +0000 +@@ -910,8 +910,8 @@ dir_env_var = 'ATLAS' _lib_names = ['f77blas','cblas'] if sys.platform[:7]=='freebsd': @@ -11,7 +11,7 @@ else: _lib_atlas = ['atlas'] _lib_lapack = ['lapack'] -@@ -938,6 +938,7 @@ +@@ -939,6 +939,7 @@ atlas = self.check_libs2(d,atlas_libs,[]) lapack_atlas = self.check_libs2(d,['lapack_atlas'],[]) if atlas is not None: @@ -19,14 +19,3 @@ lib_dirs2 = [d] + self.combine_paths(d,['atlas*','ATLAS*']) for d2 in lib_dirs2: lapack = self.check_libs2(d2,lapack_libs,[]) -@@ -1383,8 +1384,9 @@ - atlas_info = get_info('atlas_blas') - atlas_version = None - need_blas = 0 -+ lapack_type = self.cp.get(self.section, 'lapack_type').strip() - info = {} -- if atlas_info: -+ if lapack_type == 'atlas' and atlas_info: - version_info = atlas_info.copy() - atlas_version = get_atlas_version(**version_info) - if 'define_macros' not in atlas_info:
\ No newline at end of file |