diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-02-15 16:28:38 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-03-21 04:06:14 +0000 |
| commit | 270d04e4ea0e3a7f4443557f5ff65e6f9e426295 (patch) | |
| tree | 92497431f2c83a3f6d2493d5b28b28a34f4e44ba /lib | |
| parent | fa980eb654a28a652cec64b2374858645e1bf533 (diff) | |
| download | samba-270d04e4ea0e3a7f4443557f5ff65e6f9e426295.tar.gz | |
build: Remove --extra-python
This option is quite invasive in waf and was mainly for the python3 transition.
Testing with multiple python versions can be done by testing a full compile against
multiple versions, likewise multiple different binding versions can be created
the same way.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ldb-samba/wscript_build | 2 | ||||
| -rw-r--r-- | lib/ldb/wscript | 11 | ||||
| -rw-r--r-- | lib/talloc/wscript | 7 |
3 files changed, 0 insertions, 20 deletions
diff --git a/lib/ldb-samba/wscript_build b/lib/ldb-samba/wscript_build index c8464261d61..396a3816c21 100644 --- a/lib/ldb-samba/wscript_build +++ b/lib/ldb-samba/wscript_build @@ -22,8 +22,6 @@ for env in bld.gen_python_environments(): pyparam_util = bld.pyembed_libname('pyparam_util') pyldb_util = bld.pyembed_libname('pyldb-util') pyauth = 'pyauth' - if bld.env['IS_EXTRA_PYTHON']: - pyauth = 'extra-' + pyauth bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c', deps='ldbsamba %s ldbwrap %s %s' % (pyparam_util, pyldb_util, pyauth), realname='samba/_ldb.so') diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 8f14b09b583..051c274f3c8 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -92,17 +92,6 @@ def configure(conf): implied_deps='replace talloc tdb tevent ldb'): using_system_pyldb_util = False - # We need to get a pyldb-util for all the python versions - # we are building for - if conf.env['EXTRA_PYTHON']: - name = 'pyldb-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] - if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, - minversion=VERSION, - maxversion=max_ldb_version_dots, - onlyif='talloc tdb tevent', - implied_deps='replace talloc tdb tevent ldb'): - using_system_pyldb_util = False - if using_system_pyldb_util: conf.define('USING_SYSTEM_PYLDB_UTIL', 1) diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 6a0da625362..eb68279638b 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -81,13 +81,6 @@ def configure(conf): if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, implied_deps='talloc replace'): using_system_pytalloc_util = False - # We need to get a pytalloc-util for all the python versions - # we are building for - if conf.env['EXTRA_PYTHON']: - name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] - if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, - implied_deps='talloc replace'): - using_system_pytalloc_util = False if using_system_pytalloc_util: conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) |