From 57f2f1d72a70a80e61a2ed6f1abc63a177a590ab Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 9 Dec 2010 21:58:20 +1100
Subject: [PATCH] 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
---
 buildtools/wafsamba/wafsamba.py | 5 -----
 lib/talloc/wscript              | 6 ++----
 lib/tdb/wscript                 | 4 +---
 lib/tevent/wscript              | 4 +---
 source4/lib/ldb/wscript         | 6 ++----
 5 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 2c6f4b788328..fb6853135381 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -191,11 +191,6 @@ def SAMBA_LIBRARY(bld, libname, source,
 
     ldflags = TO_LIST(ldflags)
 
-    if private_library:
-        if vnum:
-            Logs.error("vnum is invalid for private libraries")
-            sys.exit(1)
-
     features = 'cc cshlib symlink_lib install_lib'
     if target_type == 'PYTHON':
         features += ' pyext'
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 3d359c1281b6..a23532a189ce 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 5fc64aa9e62e..fadd24f60fb2 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 81cc594fc25a..14c4c603194e 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',
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index b785fefa1024..c75525d10620 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -74,10 +74,8 @@ def build(bld):
 
     if bld.env.standalone_ldb:
         private_library = False
-        vnum = VERSION
     else:
         private_library = True
-        vnum = None
 
     LDB_MAP_SRC = bld.SUBDIR('ldb_map',
                              'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c')
@@ -108,7 +106,7 @@ def build(bld):
                           deps='ldb',
                           source='pyldb_util.c',
                           public_headers='pyldb.h',
-                          vnum=vnum,
+                          vnum=VERSION,
                           private_library=private_library,
                           pc_files='pyldb-util.pc',
                           pyext=True)
@@ -130,7 +128,7 @@ def build(bld):
                           public_headers='include/ldb.h include/ldb_errors.h '\
                           'include/ldb_module.h include/ldb_handlers.h',
                           pc_files='ldb.pc',
-                          vnum=vnum,
+                          vnum=VERSION,
                           private_library=private_library,
                           manpages='man/ldb.3',
                           abi_directory = 'ABI',
-- 
2.34.1