PY3: use pyembed_libname for library names (otherwise missing deps)

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build
index 2dd18193c94d43d5f65a4a891726dafd7f897efd..a79b6d9f10d192bebf616c2f868e3d103c4262b4 100644 (file)
--- a/source4/torture/local/wscript_build
+++ b/source4/torture/local/wscript_build
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+provision = bld.pyembed_libname('PROVISION')
+
 TORTURE_LOCAL_SOURCE = '''../../../lib/util/charset/tests/iconv.c
        ../../../lib/talloc/testsuite.c ../../lib/messaging/tests/messaging.c
        ../../lib/messaging/tests/irpc.c ../../librpc/tests/binding_string.c
@@ -27,7 +29,7 @@ TORTURE_LOCAL_SOURCE = '''../../../lib/util/charset/tests/iconv.c
        nss_tests.c
        fsrvp_state.c'''
 
-TORTURE_LOCAL_DEPS = 'RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION ldb samdb replace-test RPC_FSS_STATE util_str_escape'
+TORTURE_LOCAL_DEPS = 'RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry %s ldb samdb replace-test RPC_FSS_STATE util_str_escape' % provision
 
 bld.SAMBA_MODULE('TORTURE_LOCAL',
        source=TORTURE_LOCAL_SOURCE,

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index aceededc9d83fdc6398c5f7b8d78d2a6dd58570a..8d46d7355bc49159b8e4923d853db474e8a85d2c 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+provision = bld.pyembed_libname('PROVISION')
+samba_net = bld.pyembed_libname('samba-net')
 
 bld.SAMBA_SUBSYSTEM('TORTURE_UTIL',
        source='util_smb.c',
@@ -80,7 +82,6 @@ if bld.AD_DC_BUILD_IS_ENABLED():
         torture_rpc_backupkey = 'rpc/backupkey.c'
     else:
         torture_rpc_backupkey = 'rpc/backupkey_heimdal.c'
-
 bld.SAMBA_MODULE('torture_rpc',
                  source='''
                         rpc/join.c
@@ -167,7 +168,7 @@ bld.SAMBA_MODULE('torture_rpc',
                       RPC_NDR_OXIDRESOLVER
                       RPC_NDR_NTSVCS
                       WB_HELPER
-                      samba-net
+                      %s
                       LIBCLI_AUTH
                       popt
                       POPT_CREDENTIALS
@@ -184,7 +185,7 @@ bld.SAMBA_MODULE('torture_rpc',
                       RPC_NDR_WITNESS
                       RPC_NDR_BACKUPKEY
                       RPC_NDR_WINSPOOL
-                      ''' + ntvfs_specific['deps'],
+                      ''' % samba_net + ntvfs_specific['deps'],
                  internal_module=True,
                  enabled=bld.PYTHON_BUILD_IS_ENABLED())
 
@@ -268,7 +269,7 @@ bld.SAMBA_MODULE('TORTURE_NET',
        autoproto='libnet/proto.h',
        subsystem='smbtorture',
        init_function='torture_net_init',
-       deps='samba-net popt POPT_CREDENTIALS torture_rpc PROVISION',
+       deps='%s popt POPT_CREDENTIALS torture_rpc %s' % (provision, samba_net),
        internal_module=True,
        enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )

diff --git a/source4/web_server/wscript_build b/source4/web_server/wscript_build
index b845067d994224bfa4b753ce89d025007e85bb4c..97c550b83fd9bb08b6e46631865de48af6febb4c 100644 (file)
--- a/source4/web_server/wscript_build
+++ b/source4/web_server/wscript_build
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+libpython = bld.pyembed_libname('LIBPYTHON')
 
 bld.SAMBA_SUBSYSTEM('WEB_WSGI',
                source='wsgi.c',
@@ -13,7 +14,7 @@ bld.SAMBA_MODULE('service_web',
                source='web_server.c',
                subsystem='service',
                init_function='server_service_web_init',
-               deps='LIBTLS process_model LIBPYTHON WEB_WSGI',
+               deps='LIBTLS process_model %s WEB_WSGI' % libpython,
                pyembed=True,
                internal_module=False,
                enabled=bld.AD_DC_BUILD_IS_ENABLED()