diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/distutils/command/scons.py | 19 | ||||
| -rw-r--r-- | numpy/fft/SConstruct | 5 | ||||
| -rw-r--r-- | numpy/lib/SConstruct | 5 | ||||
| -rw-r--r-- | numpy/linalg/SConstruct | 10 | ||||
| -rw-r--r-- | numpy/numarray/SConstruct | 5 | ||||
| -rw-r--r-- | numpy/random/SConstruct | 6 |
6 files changed, 26 insertions, 24 deletions
diff --git a/numpy/distutils/command/scons.py b/numpy/distutils/command/scons.py index 6e2ec2941..1c825ffec 100644 --- a/numpy/distutils/command/scons.py +++ b/numpy/distutils/command/scons.py @@ -85,6 +85,8 @@ def dist2sconsfc(compiler): return 'g77' elif compiler.compiler_type == 'gnu95': return 'gfortran' + elif compiler.compiler_type == 'sun': + return 'sunf77' else: # XXX: Just give up for now, and use generic fortran compiler return 'fortran' @@ -196,6 +198,15 @@ def select_packages(sconspkg, pkglist): raise ValueError(msg) return common +def is_bootstrapping(): + import __builtin__ + try: + __builtin__.__NUMPY_SETUP__ + return True + except AttributeError: + return False + __NUMPY_SETUP__ = False + class scons(old_build_ext): # XXX: add an option to the scons command for configuration (auto/force/cache). description = "Scons builder" @@ -303,6 +314,8 @@ class scons(old_build_ext): else: # nothing to do, just leave it here. return + + print "is bootstrapping ? %s" % is_bootstrapping() # XXX: when a scons script is missing, scons only prints warnings, and # does not return a failure (status is 0). We have to detect this from # distutils (this cannot work for recursive scons builds...) @@ -326,6 +339,11 @@ class scons(old_build_ext): post_hooks = self.post_hooks pkg_names = self.pkg_names + if is_bootstrapping(): + bootstrap = 1 + else: + bootstrap = 0 + for sconscript, pre_hook, post_hook, pkg_name in zip(sconscripts, pre_hooks, post_hooks, pkg_names): @@ -364,6 +382,7 @@ class scons(old_build_ext): elif int(self.silent) == 3: cmd.append('-s') cmd.append('silent=%d' % int(self.silent)) + cmd.append('bootstrapping=%d' % bootstrap) cmdstr = ' '.join(cmd) if int(self.silent) < 1: log.info("Executing scons command (pkg is %s): %s ", pkg_name, cmdstr) diff --git a/numpy/fft/SConstruct b/numpy/fft/SConstruct index 2a53f6477..2f7688cf5 100644 --- a/numpy/fft/SConstruct +++ b/numpy/fft/SConstruct @@ -1,8 +1,5 @@ -# Last Change: Thu Oct 18 09:00 PM 2007 J +# Last Change: Tue May 20 05:00 PM 2008 J # vim:syntax=python -import __builtin__ -__builtin__.__NUMPY_SETUP__ = True -from numpy.distutils.misc_util import get_numpy_include_dirs from numscons import GetNumpyEnvironment, scons_get_paths env = GetNumpyEnvironment(ARGUMENTS) diff --git a/numpy/lib/SConstruct b/numpy/lib/SConstruct index 84795da48..e09449387 100644 --- a/numpy/lib/SConstruct +++ b/numpy/lib/SConstruct @@ -1,8 +1,5 @@ -# Last Change: Thu Oct 18 09:00 PM 2007 J +# Last Change: Tue May 20 05:00 PM 2008 J # vim:syntax=python -import __builtin__ -__builtin__.__NUMPY_SETUP__ = True -from numpy.distutils.misc_util import get_numpy_include_dirs from numscons import GetNumpyEnvironment, scons_get_paths env = GetNumpyEnvironment(ARGUMENTS) 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) diff --git a/numpy/numarray/SConstruct b/numpy/numarray/SConstruct index aa780be87..e07b45ae7 100644 --- a/numpy/numarray/SConstruct +++ b/numpy/numarray/SConstruct @@ -1,8 +1,5 @@ -# Last Change: Fri Oct 19 09:00 AM 2007 J +# Last Change: Tue May 20 05:00 PM 2008 J # vim:syntax=python -import __builtin__ -__builtin__.__NUMPY_SETUP__ = True -from numpy.distutils.misc_util import get_numpy_include_dirs from numscons import GetNumpyEnvironment, scons_get_paths env = GetNumpyEnvironment(ARGUMENTS) diff --git a/numpy/random/SConstruct b/numpy/random/SConstruct index 95957ccd7..2cec3f939 100644 --- a/numpy/random/SConstruct +++ b/numpy/random/SConstruct @@ -1,11 +1,7 @@ -# Last Change: Tue Nov 13 11:00 PM 2007 J +# Last Change: Tue May 20 05:00 PM 2008 J # vim:syntax=python import os -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 |