sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

adjust ldb config for py3 build

Browse Source 
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>
This commit is contained in:
Noel Power 2018-11-24 16:41:53 +00:00 committed by Noel Power
parent a7cb10e4b4
commit 447276e297
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ldb/wscript
View File

@ -84,7 +84,8 @@ def configure(conf):
conf.define('USING_SYSTEM_LDB', 1) conf.define('USING_SYSTEM_LDB', 1)
else: else:
using_system_pyldb_util = True 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, minversion=VERSION,
maxversion=max_ldb_version_dots, maxversion=max_ldb_version_dots,
onlyif='talloc tdb tevent', onlyif='talloc tdb tevent',
@ -108,7 +109,7 @@ def configure(conf):
if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb',
minversion=VERSION, minversion=VERSION,
maxversion=max_ldb_version_dots, maxversion=max_ldb_version_dots,
onlyif='talloc tdb tevent pyldb-util', onlyif='talloc tdb tevent %s' % dflt_name,
implied_deps='replace talloc tdb tevent'): implied_deps='replace talloc tdb tevent'):
conf.define('USING_SYSTEM_LDB', 1) conf.define('USING_SYSTEM_LDB', 1)