From: Noel Power <noel.power@suse.com>
Date: Fri, 6 Apr 2018 15:35:49 +0000 (+0100)
Subject: python/wscript: build grouping library for py2/py3 (--extra-python)
X-Git-Tag: ldb-1.4.0~606
X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=6716971ce1b023affc2503b72e83c22581faf64a

python/wscript: build grouping library for py2/py3 (--extra-python)

Grouping library is not used for any delivered libraries, however
it is used internally when building local libraries used when
"make test TESTS='blah'" is invoked. Failure to provide the grouping
library results in missing symbols (and cores) when running tests

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/python/wscript b/python/wscript
index 211fac4de62..2978f187b67 100644
--- a/python/wscript
+++ b/python/wscript
@@ -39,23 +39,21 @@ def configure(conf):
         f.close()
 
 def build(bld):
-    bld.SAMBA_LIBRARY('samba_python',
-                      source=[],
-                      deps='''
-                           LIBPYTHON
-                           pytalloc-util
-                           pyrpc_util
-                           ''',
-                      grouping_library=True,
-                      private_library=True,
-                      pyembed=True,
-                      enabled=bld.PYTHON_BUILD_IS_ENABLED())
+
 
     for env in bld.gen_python_environments():
         pytalloc_util = bld.pyembed_libname('pytalloc-util')
         pyparam_util = bld.pyembed_libname('pyparam_util')
         libpython = bld.pyembed_libname('LIBPYTHON')
-
+        pyrpc_util = bld.pyembed_libname('pyrpc_util')
+        samba_python = bld.pyembed_libname('samba_python')
+        bld.SAMBA_LIBRARY(samba_python,
+                      source=[],
+                      deps='%s %s %s' % (libpython, pytalloc_util, pyrpc_util),
+                      grouping_library=True,
+                      private_library=True,
+                      pyembed=True,
+                      enabled=bld.PYTHON_BUILD_IS_ENABLED())
         bld.SAMBA_PYTHON('python_glue',
                          source='pyglue.c',
                          deps='''