diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-12-09 21:58:20 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-12-09 12:47:40 +0100 |
| commit | 57f2f1d72a70a80e61a2ed6f1abc63a177a590ab (patch) | |
| tree | f034ee148b05cc9f59c9f96128c165d363009a5b /lib | |
| parent | ca247bee2fbd444dfd1abe94c83472ac8e3c1ad1 (diff) | |
| download | samba-57f2f1d72a70a80e61a2ed6f1abc63a177a590ab.tar.gz samba-57f2f1d72a70a80e61a2ed6f1abc63a177a590ab.tar.bz2 samba-57f2f1d72a70a80e61a2ed6f1abc63a177a590ab.zip | |
waf: remove the restriction that private libraries must not have a vnum
we need the vnum for ABI checking for public libraries built as
private libraries when bundled
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu Dec 9 12:47:41 CET 2010 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/talloc/wscript | 6 | ||||
| -rw-r--r-- | lib/tdb/wscript | 4 | ||||
| -rw-r--r-- | lib/tevent/wscript | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 3d359c1281..a23532a189 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -76,7 +76,6 @@ def build(bld): bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION) bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h') private_library = False - vnum = VERSION # should we also install the symlink to libtalloc1.so here? bld.SAMBA_LIBRARY('talloc-compat1-%s' % (VERSION), @@ -89,7 +88,6 @@ def build(bld): bld.PKG_CONFIG_FILES('pytalloc-util.pc', vnum=VERSION) else: private_library = True - vnum = None if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'): @@ -99,7 +97,7 @@ def build(bld): abi_directory='ABI', abi_match='talloc* _talloc*', hide_symbols=True, - vnum=vnum, + vnum=VERSION, private_library=private_library, manpages='talloc.3') @@ -111,7 +109,7 @@ def build(bld): abi_directory='ABI', abi_match='py* Py*', pyext=True, - vnum=vnum, + vnum=VERSION, private_library=private_library, ) bld.INSTALL_FILES('${INCLUDEDIR}', 'pytalloc.h') diff --git a/lib/tdb/wscript b/lib/tdb/wscript index 5fc64aa9e6..fadd24f60f 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -66,11 +66,9 @@ def build(bld): bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' bld.PKG_CONFIG_FILES('tdb.pc', vnum=VERSION) bld.INSTALL_FILES('${INCLUDEDIR}', 'include/tdb.h', flat=True) - vnum = VERSION private_library = False else: private_library = True - vnum = None if not bld.CONFIG_SET('USING_SYSTEM_TDB'): bld.SAMBA_LIBRARY('tdb', @@ -80,7 +78,7 @@ def build(bld): abi_directory='ABI', abi_match='tdb_*', hide_symbols=True, - vnum=vnum, + vnum=VERSION, private_library=private_library) bld.SAMBA_BINARY('tdbtorture', diff --git a/lib/tevent/wscript b/lib/tevent/wscript index 81cc594fc2..14c4c60319 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -71,10 +71,8 @@ def build(bld): bld.PKG_CONFIG_FILES('tevent.pc', vnum=VERSION) bld.INSTALL_FILES('${INCLUDEDIR}', 'tevent.h') private_library = False - vnum = VERSION else: private_library = True - vnum = None if not bld.CONFIG_SET('USING_SYSTEM_TEVENT'): bld.SAMBA_LIBRARY('tevent', @@ -83,7 +81,7 @@ def build(bld): enabled= not bld.CONFIG_SET('USING_SYSTEM_TEVENT'), abi_directory='ABI', abi_match='tevent_* _tevent_*', - vnum=vnum, + vnum=VERSION, private_library=private_library) bld.SAMBA_PYTHON('pytevent', |