wafsamba: remove unused private_library argument of PRIVATE_NAME()

The only caller asserts that private_library is True.

Use: git show -U5

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14780

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 6ca6cde0e25cf44c71fe1854e41ad1c8671a04bc..72eca18cb28dc31173efecef949c837da0448476 100644 (file)
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -5,12 +5,9 @@ from waflib import Build, Options, Logs
 from waflib.Configure import conf
 from wafsamba import samba_utils
 
-def PRIVATE_NAME(bld, name, private_extension, private_library):
+def PRIVATE_NAME(bld, name, private_extension):
     '''possibly rename a library to include a bundled extension'''
 
-    if not private_library:
-        return name
-
     # we now use the same private name for libraries as the public name.
     # see http://git.samba.org/?p=tridge/junkcode.git;a=tree;f=shlib for a
     # demonstration that this is the right thing to do

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index c3806baf3b2e1f413e6110c88147c1704fad9aba..3a5d84603365f5f9bef94c3ec611c829d3bcd5cc 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -235,7 +235,7 @@ def SAMBA_LIBRARY(bld, libname, source,
         if abi_directory or vnum or soname:
             bundled_extension=True
         bundled_name = PRIVATE_NAME(bld, libname.replace('_', '-'),
-                                    bundled_extension, private_library)
+                                    bundled_extension)
 
     ldflags = TO_LIST(ldflags)
     if bld.env['ENABLE_RELRO'] is True: