diff options
| author | Ian Stakenvicius <axs@gentoo.org> | 2017-07-25 16:31:14 -0400 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-08-01 03:59:24 +0200 |
| commit | 5b316a4c7aa830194bf254942daa5aef88a0ed17 (patch) | |
| tree | 2b8aaf1abed14f3fb15b76c331e77e77fd504e41 /lib/talloc/wscript | |
| parent | 39c6274084e5d72d6fdfae1fb9fede439f6ad60d (diff) | |
| download | samba-5b316a4c7aa830194bf254942daa5aef88a0ed17.tar.gz | |
waf: disable-python - fix talloc wscript if bundling disabled
The pytalloc-util dependency logic in lib/talloc/wscript on a
standalone build checks for pytalloc-util in a manner that will
fail if bundling is disabled, this causes issues on
--disable-python builds of ldb, tevent, and samba.
This patch restructures the logic to skip checks if python
is disabled, instead just setting the temporary state variable
'using_system_pytalloc_util' to False
Successfully tested patch on ldb-1.1.31 and above, tevent-0.9.33,
and samba-4.7_rc3
Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'lib/talloc/wscript')
| -rw-r--r-- | lib/talloc/wscript | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 0274dc0eeff..ab74e727950 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -74,19 +74,22 @@ def configure(conf): implied_deps='replace'): conf.define('USING_SYSTEM_TALLOC', 1) - using_system_pytalloc_util = True - if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, - implied_deps='talloc replace'): + if conf.env.disable_python: 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, + else: + using_system_pytalloc_util = True + if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', 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) |