From: Noel Power Date: Thu, 5 Apr 2018 15:58:33 +0000 (+0100) Subject: s3/libnet/wscript: build samba-net lib for extra-python/py3 X-Git-Tag: ldb-1.4.0~608 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84f7ead29ab6cd71a24022994c8af5812738b913;p=thirdparty%2Fsamba.git s3/libnet/wscript: build samba-net lib for extra-python/py3 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 Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build index a4494310f66..275b35420a7 100644 --- a/source4/libnet/wscript_build +++ b/source4/libnet/wscript_build @@ -1,20 +1,25 @@ #!/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') + 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', - deps='samba-net %s %s' % (pyrpc_util, pytalloc_util), + deps='%s %s %s' % (name, pyrpc_util, pytalloc_util), realname='samba/net.so' )