From: Noel Power <noel.power@suse.com>
Date: Sat, 24 Nov 2018 16:41:53 +0000 (+0000)
Subject: adjust ldb config for py3 build
X-Git-Tag: tdb-1.3.17~412
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=447276e2974ae5288eaf5dbe448bf52b27ec0839;p=thirdparty%2Fsamba.git

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>
---

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)