diff options
| author | Noel Power <noel.power@suse.com> | 2018-11-24 16:41:53 +0000 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2018-12-10 10:38:24 +0100 |
| commit | 447276e2974ae5288eaf5dbe448bf52b27ec0839 (patch) | |
| tree | 7de851c6f1a2b24fff4b5c2755fdef3705c224af /lib | |
| parent | a7cb10e4b475e0a41517f3e7be502be5e2ebb54e (diff) | |
| download | samba-447276e2974ae5288eaf5dbe448bf52b27ec0839.tar.gz | |
adjust ldb config for py3 build
waf code is making assumptions that main build is py2 and extra build
is py3, this results in wrong library names being used.
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ldb/wscript | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 61acbd2edf9..49517d2770d 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -84,7 +84,8 @@ def configure(conf): conf.define('USING_SYSTEM_LDB', 1) else: using_system_pyldb_util = True - if not conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', + dflt_name = 'pyldb-util' + conf.all_envs['default']['PYTHON_SO_ABI_FLAG'] + if not conf.CHECK_BUNDLED_SYSTEM_PKG(dflt_name, minversion=VERSION, maxversion=max_ldb_version_dots, onlyif='talloc tdb tevent', @@ -108,7 +109,7 @@ def configure(conf): if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION, maxversion=max_ldb_version_dots, - onlyif='talloc tdb tevent pyldb-util', + onlyif='talloc tdb tevent %s' % dflt_name, implied_deps='replace talloc tdb tevent'): conf.define('USING_SYSTEM_LDB', 1) |