s3/libnet/wscript: build samba-net lib for extra-python/py3
authorNoel Power <noel.power@suse.com>
Thu, 5 Apr 2018 15:58:33 +0000 (16:58 +0100)
committerDouglas Bagnall <dbagnall@samba.org>
Fri, 13 Apr 2018 05:27:11 +0000 (07:27 +0200)
python_net needs to link appropriate samba-net library for extra-py/py3
version so we need to build it for extra-python/py3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
source4/libnet/wscript_build

index a4494310f66f3ad760d430f7e1fc5ea98a65c92b..275b35420a70b27d4f77c25c5cf58eec65ea1115 100644 (file)
@@ -1,20 +1,25 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 
-bld.SAMBA_LIBRARY('samba-net',
-       source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c',
-       autoproto='libnet_proto.h',
-       public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser PROVISION LIBCLI_SAMSYNC LIBTSOCKET',
-       private_library=True,
-       enabled=bld.PYTHON_BUILD_IS_ENABLED()
-       )
-
-
 for env in bld.gen_python_environments():
        pytalloc_util = bld.pyembed_libname('pytalloc-util')
        pyrpc_util = bld.pyembed_libname('pyrpc_util')
 for env in bld.gen_python_environments():
        pytalloc_util = bld.pyembed_libname('pytalloc-util')
        pyrpc_util = bld.pyembed_libname('pyrpc_util')
+       provision = bld.pyembed_libname('PROVISION')
+       name = bld.pyembed_libname('samba-net')
+       auto_proto='libnet_proto.h'
+       if bld.env['IS_EXTRA_PYTHON']:
+               auto_proto=None
+       bld.SAMBA_LIBRARY(name,
+               source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c',
+               autoproto=auto_proto,
+               public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser %s LIBCLI_SAMSYNC LIBTSOCKET' % (provision),
+               private_library=True,
+               pyembed=True,
+               enabled=bld.PYTHON_BUILD_IS_ENABLED()
+               )
+
        bld.SAMBA_PYTHON('python_net',
                source='py_net.c',
        bld.SAMBA_PYTHON('python_net',
                source='py_net.c',
-               deps='samba-net %s %s' % (pyrpc_util, pytalloc_util),
+               deps='%s %s %s' % (name, pyrpc_util, pytalloc_util),
                realname='samba/net.so'
                )
 
                realname='samba/net.so'
                )