diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-29 12:09:06 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-29 06:22:44 +0200 |
| commit | f3862b917168ade88a048cdee688986b0479fe37 (patch) | |
| tree | e3a18ca9acf92d6dd334acc25ba3e0f2b3b68840 /source3 | |
| parent | 485787f0dfa64bbada7c971ec44f04a1095b4229 (diff) | |
| download | samba-f3862b917168ade88a048cdee688986b0479fe37.tar.gz samba-f3862b917168ade88a048cdee688986b0479fe37.tar.bz2 samba-f3862b917168ade88a048cdee688986b0479fe37.zip | |
ccan: we're subsystems, not a library.
Don't expose a libccan.so; it would produce clashes if someone else
does the same thing. Unfortunately, if we just change it from a
SAMBA_LIBRARY to a SAMBA_SUBSYSTEM, it doesn't create a static library
as we'd like, but links all the object files in. This means we get
many duplicates (eg. everyone gets a copy of tally, even though only
ntdb wants it).
So, the solution is twofold:
1) Make the ccan modules separate.
2) Make the ccan modules SAMBA_SUBSYSTEMs not SAMBA_LIBRARYs so we don't
build shared libraries which we can't share.
3) Make the places which uses ccan explicit.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-User(master): Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date(master): Fri Jun 29 06:22:44 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
| -rwxr-xr-x | source3/wscript_build | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index edb2f914b3..c407aa59c1 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -647,7 +647,7 @@ bld.SAMBA3_LIBRARY('netapi', bld.SAMBA3_LIBRARY('smbsharemodes', source=LIBSMBSHAREMODES_SRC, public_deps='''talloc tdb_compat''', - deps='''ccan''', + deps='''ccan-hash''', public_headers='include/smb_share_modes.h', pc_files='libsmb/smbsharemodes.pc', vnum='0', @@ -780,7 +780,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('samba3util', source=LIB_UTIL_SRC, - deps='ndr security NDR_SECURITY samba-util util_tdb ccan', + deps='ndr security NDR_SECURITY samba-util util_tdb ccan-hash', vars=locals()) bld.SAMBA3_SUBSYSTEM('pidfile', @@ -803,7 +803,6 @@ bld.SAMBA3_SUBSYSTEM('samba3core', param dbwrap samba3-util - ccan errors3''', vars=locals()) |