Revert "buildtools: only use the ABI based version script for non private libraries"

This reverts commit 4d3126555ae05bc991d06cf08535a6e815479709.

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 7fbb345e324a07c170a92c842fbfc51de29af50f..3cb97c07236a23efc4cdcd24d03cd59bb3b8d4bc 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -206,15 +206,12 @@ def SAMBA_LIBRARY(bld, libname, source,
         vscript = "%s.vscript" % libname
         if private_library:
             version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
-            vscript_abi_directory = None
         elif vnum:
             version = "%s_%s" % (libname, vnum)
-            vscript_abi_directory = abi_directory
         else:
             version = None
-            vscript_abi_directory = None
         if version:
-            bld.ABI_VSCRIPT(libname, vscript_abi_directory, version, vscript)
+            bld.ABI_VSCRIPT(libname, abi_directory, version, vscript)
             ldflags.append("-Wl,--version-script=%s/%s" % (bld.path.abspath(bld.env), vscript))
             fullname = bld.env.shlib_PATTERN % bundled_name
             bld.add_manual_dependency(bld.path.find_or_declare(fullname), bld.path.find_or_declare(vscript))