diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-03 09:20:02 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-03 09:20:02 +0200 |
| commit | a3c9dd3d48a97bf7c1c7731f0e52b72cc019fb1b (patch) | |
| tree | bffa541130878e967df8cd3d7ab2155aff761ff1 | |
| parent | 7e52436673402095811eb081a0c036427fd31f84 (diff) | |
| download | samba-a3c9dd3d48a97bf7c1c7731f0e52b72cc019fb1b.tar.gz samba-a3c9dd3d48a97bf7c1c7731f0e52b72cc019fb1b.tar.bz2 samba-a3c9dd3d48a97bf7c1c7731f0e52b72cc019fb1b.zip | |
s3-build Prepare to require fully defined modules
This specifies some more deps for our modules, and ensures that the
subsystem that it links against is in fact a library, which will avoid
issues with introducing duplicate symbols.
Andrew Bartlett
| -rw-r--r-- | source3/auth/wscript_build | 8 | ||||
| -rw-r--r-- | source3/modules/wscript_build | 7 | ||||
| -rw-r--r-- | source3/winbindd/wscript_build | 15 |
3 files changed, 18 insertions, 12 deletions
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build index 74d870fc1b..352ca1532c 100644 --- a/source3/auth/wscript_build +++ b/source3/auth/wscript_build @@ -32,10 +32,11 @@ bld.SAMBA3_SUBSYSTEM('AUTH_COMMON', deps='TOKEN_UTIL DCUTIL USER_UTIL', vars=locals()) -bld.SAMBA3_SUBSYSTEM('auth', +bld.SAMBA3_LIBRARY('auth', source=AUTH_SRC, deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL AUTH_COMMON''', - vars=locals()) + allow_undefined_symbols=True, + private_library=True) bld.SAMBA3_MODULE('auth_sam', subsystem='auth', @@ -75,7 +76,8 @@ bld.SAMBA3_MODULE('auth_server', deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_server'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_server')) + enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_server'), + allow_undefined_symbols=True) bld.SAMBA3_MODULE('auth_domain', subsystem='auth', diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index 920b7c1971..2ae7a7e33a 100644 --- a/source3/modules/wscript_build +++ b/source3/modules/wscript_build @@ -62,7 +62,7 @@ bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL', bld.SAMBA3_SUBSYSTEM('vfs', source='', - deps='', + deps='smbd_base', vars=locals()) bld.SAMBA3_MODULE('vfs_default', @@ -345,7 +345,8 @@ bld.SAMBA3_MODULE('vfs_aio_fork', deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_fork'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork')) + enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork'), + allow_undefined_symbols=True) bld.SAMBA3_MODULE('vfs_preopen', subsystem='vfs', @@ -450,7 +451,7 @@ PERFCOUNT_TEST_SRC = 'perfcount_test.c' bld.SAMBA3_SUBSYSTEM('perfcount', source='', - vars=locals()) + deps='smbd_base') bld.SAMBA3_MODULE('perfcount_onefs', subsystem='perfcount', diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build index 387f15065a..3bd14ee534 100644 --- a/source3/winbindd/wscript_build +++ b/source3/winbindd/wscript_build @@ -22,10 +22,12 @@ IDMAP_AUTORID_SRC = '''idmap_autorid.c''' IDMAP_RW_SRC = 'idmap_rw.c' IDMAP_SRC = 'idmap.c idmap_util.c ${IDMAP_RW_SRC}' -bld.SAMBA3_SUBSYSTEM('idmap', - source=IDMAP_SRC, - deps='samba-util', - vars=locals()) +bld.SAMBA3_LIBRARY('idmap', + source=IDMAP_SRC, + deps='samba-util', + vars=locals(), + allow_undefined_symbols=True, + private_library=True) bld.SAMBA3_SUBSYSTEM('IDMAP_ADEX', source=IDMAP_ADEX_SRC, @@ -60,7 +62,7 @@ bld.SAMBA3_MODULE('idmap_rid', bld.SAMBA3_MODULE('idmap_passdb', subsystem='idmap', source=IDMAP_PASSDB_SRC, - deps='samba-util', + deps='samba-util passdb', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_passdb'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_passdb')) @@ -118,7 +120,8 @@ bld.SAMBA3_MODULE('idmap_autorid', deps='samba-util tdb', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_autorid'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_autorid')) + enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_autorid'), + allow_undefined_symbols=True) NSS_INFO_TEMPLATE_SRC = 'nss_info_template.c' |