diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-06-14 23:02:28 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-06-15 03:12:35 +0200 |
| commit | 98bd0d18db0ff6f08b38d409528a9e15b0d5b560 (patch) | |
| tree | 8186c3ebbf61998f652c854da0b607bcbeeb36c2 | |
| parent | eacb77bb927d1895525967eba154eaf76db8344c (diff) | |
| download | samba-98bd0d18db0ff6f08b38d409528a9e15b0d5b560.tar.gz samba-98bd0d18db0ff6f08b38d409528a9e15b0d5b560.tar.xz samba-98bd0d18db0ff6f08b38d409528a9e15b0d5b560.zip | |
waf: Update to newer upstream snapshot.
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Fri Jun 15 03:12:35 CEST 2012 on sn-devel-104
| -rw-r--r-- | buildtools/wafadmin/Tools/python.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/buildtools/wafadmin/Tools/python.py b/buildtools/wafadmin/Tools/python.py index 4f73081635e..511cf09141a 100644 --- a/buildtools/wafadmin/Tools/python.py +++ b/buildtools/wafadmin/Tools/python.py @@ -6,9 +6,9 @@ "Python support" import os, sys -import TaskGen, Utils, Utils, Runner, Options, Build +import TaskGen, Utils, Options from Logs import debug, warn, info -from TaskGen import extension, taskgen, before, after, feature +from TaskGen import extension, before, after, feature from Configure import conf EXT_PY = ['.py'] @@ -173,7 +173,7 @@ def check_python_headers(conf, mandatory=True): (python_prefix, python_SO, python_SYSLIBS, python_LDFLAGS, python_SHLIBS, python_LIBDIR, python_LIBPL, INCLUDEPY, Py_ENABLE_SHARED, python_MACOSX_DEPLOYMENT_TARGET) = \ - _get_python_variables(python, ["get_config_var('%s')" % x for x in v], + _get_python_variables(python, ["get_config_var('%s') or ''" % x for x in v], ['from distutils.sysconfig import get_config_var']) except RuntimeError: conf.fatal("Python development headers not found (-v for details).") @@ -310,7 +310,7 @@ def check_python_version(conf, minver=None): # Get python version string cmd = [python, "-c", "import sys\nfor x in sys.version_info: print(str(x))"] debug('python: Running python command %r' % cmd) - proc = Utils.pproc.Popen(cmd, stdout=Utils.pproc.PIPE) + proc = Utils.pproc.Popen(cmd, stdout=Utils.pproc.PIPE, shell=False) lines = proc.communicate()[0].split() assert len(lines) == 5, "found %i lines, expected 5: %r" % (len(lines), lines) pyver_tuple = (int(lines[0]), int(lines[1]), int(lines[2]), lines[3], int(lines[4])) @@ -329,14 +329,14 @@ def check_python_version(conf, minver=None): if sys.platform == 'win32': (python_LIBDEST, pydir) = \ _get_python_variables(python, - ["get_config_var('LIBDEST')", - "get_python_lib(standard_lib=0, prefix=%r)" % conf.env['PREFIX']], + ["get_config_var('LIBDEST') or ''", + "get_python_lib(standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']], ['from distutils.sysconfig import get_config_var, get_python_lib']) else: python_LIBDEST = None (pydir,) = \ _get_python_variables(python, - ["get_python_lib(standard_lib=0, prefix=%r)" % conf.env['PREFIX']], + ["get_python_lib(standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']], ['from distutils.sysconfig import get_config_var, get_python_lib']) if python_LIBDEST is None: if conf.env['LIBDIR']: @@ -348,7 +348,7 @@ def check_python_version(conf, minver=None): pyarchdir = conf.environ['PYTHONARCHDIR'] else: (pyarchdir,) = _get_python_variables(python, - ["get_python_lib(plat_specific=1, standard_lib=0, prefix=%r)" % conf.env['PREFIX']], + ["get_python_lib(plat_specific=1, standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']], ['from distutils.sysconfig import get_config_var, get_python_lib']) if not pyarchdir: pyarchdir = pydir @@ -390,8 +390,10 @@ def detect(conf): if not python: conf.fatal('Could not find the path of the python executable') - v = conf.env + if conf.env.PYTHON != sys.executable: + warn("python executable '%s' different from sys.executable '%s'" % (conf.env.PYTHON, sys.executable)) + v = conf.env v['PYCMD'] = '"import sys, py_compile;py_compile.compile(sys.argv[1], sys.argv[2])"' v['PYFLAGS'] = '' v['PYFLAGS_OPT'] = '-O' |