diff options
| author | David Cournapeau <cournape@gmail.com> | 2008-06-07 15:57:45 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2008-06-07 15:57:45 +0000 |
| commit | 942d2dce9638f13b964bdfb9c1d56c25f7455619 (patch) | |
| tree | 3043dc4e7e7241af5f31e0978afb796736d9bbf4 /numpy/linalg | |
| parent | abd2bda91f1503c96d4caa2fb69f8e5c492bdc9f (diff) | |
| parent | bc3cfee0148369b1a58cc8b2490c0be5cc1feb18 (diff) | |
| download | numpy-942d2dce9638f13b964bdfb9c1d56c25f7455619.tar.gz | |
Merged revisions 5204-5257 via svnmerge from
http://svn.scipy.org/svn/numpy/branches/cdavid
........
r5205 | cdavid | 2008-05-20 17:14:30 +0900 (Tue, 20 May 2008) | 3 lines
Initialized merge tracking via "svnmerge" with revisions "1-5204" from
http://svn.scipy.org/svn/numpy/trunk
........
r5206 | cdavid | 2008-05-20 17:17:27 +0900 (Tue, 20 May 2008) | 7 lines
Current handling of bootstrapping is flawed: I should handle it at the
distutils level, not at the scons level. This is the first step to detect
bootstrapping at distutils level, and pass its state to scons through command
line.
........
r5207 | cdavid | 2008-05-20 17:35:01 +0900 (Tue, 20 May 2008) | 1 line
Fix typo when passing bootstrapping option to scons.
........
r5208 | cdavid | 2008-05-20 17:41:11 +0900 (Tue, 20 May 2008) | 5 lines
Do not mess with __NUMPY_SETUP__ in scons scripts anymore: this is handled in
numscons.
........
r5209 | cdavid | 2008-05-20 17:43:46 +0900 (Tue, 20 May 2008) | 1 line
Forgot one file in lapack_lite when no LAPACK is available.
........
r5210 | cdavid | 2008-05-20 18:24:38 +0900 (Tue, 20 May 2008) | 1 line
Handle fortran compiler on open-solaris
........
Diffstat (limited to 'numpy/linalg')
| -rw-r--r-- | numpy/linalg/SConstruct | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/numpy/linalg/SConstruct b/numpy/linalg/SConstruct index 24d648ef7..5c7747cdd 100644 --- a/numpy/linalg/SConstruct +++ b/numpy/linalg/SConstruct @@ -1,11 +1,7 @@ -# Last Change: Fri Nov 16 05:00 PM 2007 J +# Last Change: Tue May 20 05:00 PM 2008 J # vim:syntax=python import os.path -import __builtin__ -__builtin__.__NUMPY_SETUP__ = True - -from numpy.distutils.misc_util import get_numpy_include_dirs, get_mathlibs from numscons import GetNumpyEnvironment, scons_get_paths, \ scons_get_mathlib from numscons import CheckF77LAPACK @@ -27,7 +23,7 @@ write_info(env) sources = ['lapack_litemodule.c'] if not use_lapack: - sources.extend(['zlapack_lite.c', 'dlapack_lite.c', 'blas_lite.c', - 'dlamch.c', 'f2c_lite.c']) + sources.extend(['python_xerbla.c', 'zlapack_lite.c', 'dlapack_lite.c', + 'blas_lite.c', 'dlamch.c', 'f2c_lite.c']) lapack_lite = env.NumpyPythonExtension('lapack_lite', source = sources) |