python: wscript_build: Build some modules for Python 3

Update a few wscript_build files to build Python 3-compatible modules
for Python 3.

Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/auth/credentials/wscript_build b/auth/credentials/wscript_build
index 009f5ecb6b6e808ce1df727650c44ff19d485129..30c0f727832d70506e39c7e7093dd59548151c3e 100644 (file)
--- a/auth/credentials/wscript_build
+++ b/auth/credentials/wscript_build
@@ -24,9 +24,9 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS_NTLM',
        source='credentials_ntlm.c',
        deps='samba-credentials')
 
-bld.SAMBA_PYTHON('pycredentials',
-       source='pycredentials.c',
-       public_deps='samba-credentials cmdline-credentials pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
-       realname='samba/credentials.so'
-       )
-
+for env in bld.gen_python_environments():
+       bld.SAMBA_PYTHON('pycredentials',
+               source='pycredentials.c',
+               public_deps='samba-credentials cmdline-credentials pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
+               realname='samba/credentials.so'
+               )

diff --git a/python/wscript_build b/python/wscript_build
index 5ab0d7d07dc6bbf0789f55ca32efce5ff56319f7..fa3b8b5de179ae69d7f3ea217c5afce9026c8392 100644 (file)
--- a/python/wscript_build
+++ b/python/wscript_build
@@ -15,12 +15,15 @@ bld.SAMBA_SUBSYSTEM('LIBPYTHON',
        pyext=True,
        )
 
+for env in bld.gen_python_environments():
+       pytalloc_util = bld.pyembed_libname('pytalloc-util')
+       pyparam_util = bld.pyembed_libname('pyparam_util')
 
-bld.SAMBA_PYTHON('python_glue',
-       source='pyglue.c',
-       deps='pyparam_util samba-util netif pytalloc-util',
-       realname='samba/_glue.so'
-       )
+       bld.SAMBA_PYTHON('python_glue',
+               source='pyglue.c',
+               deps='%s samba-util netif %s' % (pyparam_util, pytalloc_util),
+               realname='samba/_glue.so'
+               )
 
 for env in bld.gen_python_environments():
        # install out various python scripts for use by make test

diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 2ad753b7a338b78898941e2d6fea037c887311df..b7a551f53b42df87eb24e6f3b74236630b54cdb6 100644 (file)
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -35,24 +35,27 @@ bld.SAMBA_SUBSYSTEM('SECRETS',
        deps='ldb tdb-wrap util_tdb NDR_SECURITY tevent ldbwrap'
        )
 
-
-bld.SAMBA_PYTHON('pyparam',
-       source='pyparam.c',
-       deps='samba-hostconfig pytalloc-util',
-       realname='samba/param.so'
-       )
+for env in bld.gen_python_environments():
+       pytalloc_util = bld.pyembed_libname('pytalloc-util')
+       pyparam_util = bld.pyembed_libname('pyparam_util')
+
+       bld.SAMBA_PYTHON('pyparam',
+           source='pyparam.c',
+           deps='samba-hostconfig %s' % pytalloc_util,
+           realname='samba/param.so'
+           )
+
+       bld.SAMBA_SUBSYSTEM(pyparam_util,
+           source='pyparam_util.c',
+           deps='LIBPYTHON samba-hostconfig %s' % pytalloc_util,
+           pyext=True
+               )
 
 bld.SAMBA_SUBSYSTEM('param_options',
        source='loadparm.c',
        deps='samba-hostconfig')
 
 
-bld.SAMBA_SUBSYSTEM('pyparam_util',
-       source='pyparam_util.c',
-       deps='LIBPYTHON samba-hostconfig pytalloc-util',
-       pyext=True,
-       )
-
 bld.SAMBA_LIBRARY('shares',
                   source=[],
                   deps='share',