wscript_build: fix c modules deps name for Python 3

In wscript_build, the lib name in deps list may have postfix for Python
3. Instead of hard coding the base name directly, need to load correct
name for each Python version with `bld.pyembed_libname`.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/source3/param/wscript_build b/source3/param/wscript_build
index c9c42a356250e1a72b340b05febe138580a71a57..d999d0b89f282c23f653a8f65b91f06518dc6b36 100644 (file)
--- a/source3/param/wscript_build
+++ b/source3/param/wscript_build
@@ -15,10 +15,11 @@ bld.SAMBA_GENERATOR('s3_param_proto_h',
                     rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=S3PROTO')
 
 for env in bld.gen_python_environments():
+    pytalloc_util = bld.pyembed_libname('pytalloc-util')
     bld.SAMBA3_PYTHON('pys3param',
                   source='pyparam.c',
                   deps='smbconf',
-                  public_deps='samba-hostconfig pytalloc-util talloc',
+                  public_deps=' '.join(['samba-hostconfig', pytalloc_util, 'talloc']),
                   realname='samba/samba3/param.so')
 
 bld.SAMBA3_SUBSYSTEM('param_service',

diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index 0ae2c4def4082a14be4ed68a66452cafdbd46982..2a35392f209a9a1f6323563d13fa25d17967706a 100644 (file)
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -33,9 +33,11 @@ bld.SAMBA3_MODULE('pdb_samba_dsdb',
                   enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_samba_dsdb') and bld.AD_DC_BUILD_IS_ENABLED())
 
 for env in bld.gen_python_environments():
+    pyrpc_util = bld.pyembed_libname('pyrpc_util')
+    pytalloc_util = bld.pyembed_libname('pytalloc-util')
     bld.SAMBA3_PYTHON('pypassdb',
                   source='py_passdb.c',
                   deps='pdb',
-                  public_deps='samba-util tdb talloc pyrpc_util pytalloc-util',
+                  public_deps=' '.join(['samba-util', 'tdb', 'talloc', pyrpc_util, pytalloc_util]),
                   realname='samba/samba3/passdb.so'
                   )

diff --git a/source3/wscript_build b/source3/wscript_build
index f0eb23cc3f7d3038e30aeb318fbbc1cf5f23d66a..717dd9e3676aec06f1d518fe7e96fdbf848c49e6 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1298,9 +1298,11 @@ bld.SAMBA3_BINARY('vlp',
 
 
 for env in bld.gen_python_environments():
+    pyrpc_util = bld.pyembed_libname('pyrpc_util')
+    pytalloc_util = bld.pyembed_libname('pytalloc-util')
     bld.SAMBA3_PYTHON('pysmbd',
                   source='smbd/pysmbd.c',
-                  deps='smbd_base pyrpc_util pytalloc-util',
+                  deps=' '.join(['smbd_base', pyrpc_util, pytalloc_util]),
                   realname='samba/samba3/smbd.so'
                   )
 

diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build
index 0d23bcb205e1807bb8657786ed62a4a84ce546c5..2c5abb13154eb6ba71cd125be15642709ae339d6 100644 (file)
--- a/source4/lib/policy/wscript_build
+++ b/source4/lib/policy/wscript_build
@@ -11,8 +11,10 @@ bld.SAMBA_LIBRARY('samba-policy',
        )
 
 for env in bld.gen_python_environments():
-    bld.SAMBA_PYTHON('py_policy',
-           source='pypolicy.c',
-           public_deps='samba-policy pytalloc-util',
-           realname='samba/policy.so'
-           )
+    pytalloc_util = bld.pyembed_libname('pytalloc-util')
+    bld.SAMBA_PYTHON(
+        'py_policy',
+        source='pypolicy.c',
+        public_deps=' '.join(['samba-policy', pytalloc_util]),
+        realname='samba/policy.so'
+    )