# waf build tool for building IDL files with pidl
-import Build
-from samba_utils import *
-from samba_autoconf import *
-
-from Configure import conf
+import os, sys
+from waflib import Build, Logs, Utils, Configure, Errors
+from waflib.Configure import conf
@conf
-def SAMBA_CHECK_PYTHON(conf, mandatory=True, version=(2,4,2)):
+def SAMBA_CHECK_PYTHON(conf, mandatory=True, version=(3,4,0)):
+
+ if not mandatory:
+ version=(2,6,0)
+
# enable tool to build python extensions
if conf.env.HAVE_PYTHON_H:
conf.check_python_version(version)
interpreters = []
- if conf.env['EXTRA_PYTHON']:
- conf.all_envs['extrapython'] = conf.env.copy()
- conf.setenv('extrapython')
- conf.env['PYTHON'] = conf.env['EXTRA_PYTHON']
- conf.env['IS_EXTRA_PYTHON'] = 'yes'
- conf.find_program('python', var='PYTHON', mandatory=True)
- conf.check_tool('python')
- try:
- conf.check_python_version((3, 3, 0))
- except Exception:
- Logs.warn('extra-python needs to be Python 3.3 or later')
- raise
- interpreters.append(conf.env['PYTHON'])
- conf.setenv('default')
-
- conf.find_program('python', var='PYTHON', mandatory=mandatory)
- conf.check_tool('python')
- path_python = conf.find_program('python')
+ conf.find_program('python3', var='PYTHON', mandatory=mandatory)
+ conf.load('python')
+ path_python = conf.find_program('python3')
+
conf.env.PYTHON_SPECIFIED = (conf.env.PYTHON != path_python)
conf.check_python_version(version)
@conf
def SAMBA_CHECK_PYTHON_HEADERS(conf, mandatory=True):
- if conf.env["python_headers_checked"] == []:
- if conf.env['EXTRA_PYTHON']:
- conf.setenv('extrapython')
- _check_python_headers(conf, mandatory=True)
- conf.setenv('default')
+ if conf.env.disable_python:
+ if mandatory:
+ raise Errors.WafError("Cannot check for python headers when "
+ "--disable-python specified")
+
+ conf.msg("python headers", "Check disabled due to --disable-python")
+ # we don't want PYTHONDIR in config.h, as otherwise changing
+ # --prefix causes a complete rebuild
+ conf.env.DEFINES = [x for x in conf.env.DEFINES
+ if not x.startswith('PYTHONDIR=')
+ and not x.startswith('PYTHONARCHDIR=')]
+ return
+
+ if conf.env["python_headers_checked"] == []:
_check_python_headers(conf, mandatory)
conf.env["python_headers_checked"] = "yes"
- if conf.env['EXTRA_PYTHON']:
- extraversion = conf.all_envs['extrapython']['PYTHON_VERSION']
- if extraversion == conf.env['PYTHON_VERSION']:
- raise Utils.WafError("extrapython %s is same as main python %s" % (
- extraversion, conf.env['PYTHON_VERSION']))
else:
conf.msg("python headers", "using cache")
# we don't want PYTHONDIR in config.h, as otherwise changing
# --prefix causes a complete rebuild
- del(conf.env.defines['PYTHONDIR'])
- del(conf.env.defines['PYTHONARCHDIR'])
+ conf.env.DEFINES = [x for x in conf.env.DEFINES
+ if not x.startswith('PYTHONDIR=')
+ and not x.startswith('PYTHONARCHDIR=')]
def _check_python_headers(conf, mandatory):
- conf.check_python_headers(mandatory=mandatory)
+ try:
+ conf.errors.ConfigurationError
+ conf.check_python_headers()
+ except conf.errors.ConfigurationError:
+ if mandatory:
+ raise
if conf.env['PYTHON_VERSION'] > '3':
abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
else:
conf.env['PYTHON_SO_ABI_FLAG'] = ''
+ conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
+ conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))
+
+ for lib in conf.env['LINKFLAGS_PYEMBED']:
+ if lib.startswith('-L'):
+ conf.env.append_unique('LIBPATH_PYEMBED', lib[2:]) # strip '-L'
+ conf.env['LINKFLAGS_PYEMBED'].remove(lib)
+
+ # same as in waf 1.5, keep only '-fno-strict-aliasing'
+ # and ignore defines such as NDEBUG _FORTIFY_SOURCE=2
+ conf.env.DEFINES_PYEXT = []
+ conf.env.CFLAGS_PYEXT = ['-fno-strict-aliasing']
+
+ return
+
+def PYTHON_BUILD_IS_ENABLED(self):
+ return self.CONFIG_SET('HAVE_PYTHON_H')
+
+Build.BuildContext.PYTHON_BUILD_IS_ENABLED = PYTHON_BUILD_IS_ENABLED
def SAMBA_PYTHON(bld, name,
public_deps='',
realname=None,
cflags='',
+ cflags_end=None,
includes='',
init_function_sentinel=None,
local_include=True,
enabled=True):
'''build a python extension for Samba'''
- if bld.env['IS_EXTRA_PYTHON']:
- name = 'extra-' + name
+ # force-disable when we can't build python modules, so
+ # every single call doesn't need to pass this in.
+ if not bld.PYTHON_BUILD_IS_ENABLED():
+ enabled = False
# when we support static python modules we'll need to gather
# the list from all the SAMBA_PYTHON() targets
if init_function_sentinel is not None:
- cflags += '-DSTATIC_LIBPYTHON_MODULES=%s' % init_function_sentinel
+ cflags += ' -DSTATIC_LIBPYTHON_MODULES=%s' % init_function_sentinel
+
+ # From https://docs.python.org/2/c-api/arg.html:
+ # Starting with Python 2.5 the type of the length argument to
+ # PyArg_ParseTuple(), PyArg_ParseTupleAndKeywords() and PyArg_Parse()
+ # can be controlled by defining the macro PY_SSIZE_T_CLEAN before
+ # including Python.h. If the macro is defined, length is a Py_ssize_t
+ # rather than an int.
+
+ # Because <Python.h> if often included before includes.h/config.h
+ # This must be in the -D compiler options
+ cflags += ' -DPY_SSIZE_T_CLEAN=1'
source = bld.EXPAND_VARIABLES(source, vars=vars)
if realname is not None:
- link_name = 'python_modules/%s' % realname
+ link_name = 'python/%s' % realname
else:
link_name = None
public_deps=public_deps,
includes=includes,
cflags=cflags,
+ cflags_end=cflags_end,
local_include=local_include,
vars=vars,
realname=realname,
Build.BuildContext.SAMBA_PYTHON = SAMBA_PYTHON
-def pyembed_libname(bld, name, extrapython=False):
- return name + bld.env['PYTHON_SO_ABI_FLAG']
+def pyembed_libname(bld, name):
+ if bld.env['PYTHON_SO_ABI_FLAG']:
+ return name + bld.env['PYTHON_SO_ABI_FLAG']
+ else:
+ return name
Build.BuildContext.pyembed_libname = pyembed_libname
-def gen_python_environments(bld, extra_env_vars=()):
- """Generate all Python environments
-
- To be used in a for loop. Normally, the loop body will be executed once.
-
- When --extra-python is used, the body will additionaly be executed
- with the extra-python environment active.
- """
- yield
-
- if bld.env['EXTRA_PYTHON']:
- copied = ('GLOBAL_DEPENDENCIES', 'TARGET_TYPE') + tuple(extra_env_vars)
- for name in copied:
- bld.all_envs['extrapython'][name] = bld.all_envs['default'][name]
- default_env = bld.all_envs['default']
- bld.all_envs['default'] = bld.all_envs['extrapython']
- yield
- bld.all_envs['default'] = default_env
-
-Build.BuildContext.gen_python_environments = gen_python_environments
git.samba.org / sfrench / samba-autobuild / .git / blobdiff