[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  4715564 wafsamba: create unique names when building shared modules
       via  4da20e2 wafsamba: remove unused variable in SAMBA_MODULE()
       via  85a30cc wafsamba: passing 'subsystem' to SAMBA_MODULE() is not optional
       via  7668e45 wafsamba: make it possible to pass bundled_name to SAMBA_LIBRARY()
      from  691f353 lib/util: add missing commas to statfs_types

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 47155641cb48d39d3ee7d8b8962f5ed6b23617d4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Jan 17 00:24:53 2015 +0100

    wafsamba: create unique names when building shared modules
    
    After commit 76fdcf5c15bd904c3686f0c2dd93d27486c61ca4, we could endup
    with bin/default/source3/auth/libauth-samba4.so being created two times.
    Once by SAMBA3_LIBRARY('auth',...) and once again by SAMBA3_MODULE('auth_samba4', ...).
    
    As a result bin/default/source3/auth/libauth-samba4.so gets randomly
    overwritten.
    
    SAMBA3_MODULE('auth_samba4', ...) results in
    bin/default/source3/auth/libauth_module_samba4.so now.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10112
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Mon Jan 19 04:43:53 CET 2015 on sn-devel-104

commit 4da20e2e31790ca54f17b4a6039c24b7b502ac5f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Jan 17 00:24:53 2015 +0100

    wafsamba: remove unused variable in SAMBA_MODULE()
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10112
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>

commit 85a30cc44070b09de963961ccfa3d7c40144317b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Jan 17 00:24:53 2015 +0100

    wafsamba: passing 'subsystem' to SAMBA_MODULE() is not optional
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10112
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>

commit 7668e457a6463fb2c1d7499659f37d10ca322190
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Jan 17 00:24:53 2015 +0100

    wafsamba: make it possible to pass bundled_name to SAMBA_LIBRARY()
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10112
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/wafsamba.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 82a9d6f..c054315 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -130,6 +130,7 @@ def SAMBA_LIBRARY(bld, libname, source,
                   pyext=False,
                   target_type='LIBRARY',
                   bundled_extension=False,
+                  bundled_name=None,
                   link_name=None,
                   abi_directory=None,
                   abi_match=None,
@@ -223,7 +224,9 @@ def SAMBA_LIBRARY(bld, libname, source,
             raise Utils.WafError("public library '%s' must have header files" %
                        libname)
 
-    if target_type == 'PYTHON' or realname or not private_library:
+    if bundled_name is not None:
+        pass
+    elif target_type == 'PYTHON' or realname or not private_library:
         if keep_underscore:
             bundled_name = libname
         else:
@@ -442,13 +445,15 @@ def SAMBA_MODULE(bld, modname, source,
                  ):
     '''define a Samba module.'''
 
+    bld.ASSERT(subsystem, "You must specify a subsystem for SAMBA_MODULE(%s)" % modname)
+
     source = bld.EXPAND_VARIABLES(source, vars=vars)
     if subdir:
         source = bld.SUBDIR(subdir, source)
 
     if internal_module or BUILTIN_LIBRARY(bld, modname):
         # Do not create modules for disabled subsystems
-        if subsystem and GET_TARGET_TYPE(bld, subsystem) == 'DISABLED':
+        if GET_TARGET_TYPE(bld, subsystem) == 'DISABLED':
             return
         bld.SAMBA_SUBSYSTEM(modname, source,
                     deps=deps,
@@ -469,18 +474,17 @@ def SAMBA_MODULE(bld, modname, source,
         return
 
     # Do not create modules for disabled subsystems
-    if subsystem and GET_TARGET_TYPE(bld, subsystem) == 'DISABLED':
+    if GET_TARGET_TYPE(bld, subsystem) == 'DISABLED':
         return
 
-    obj_target = modname + '.objlist'
-
     realname = modname
-    if subsystem is not None:
-        deps += ' ' + subsystem
-        while realname.startswith("lib"+subsystem+"_"):
-            realname = realname[len("lib"+subsystem+"_"):]
-        while realname.startswith(subsystem+"_"):
-            realname = realname[len(subsystem+"_"):]
+    deps += ' ' + subsystem
+    while realname.startswith("lib"+subsystem+"_"):
+        realname = realname[len("lib"+subsystem+"_"):]
+    while realname.startswith(subsystem+"_"):
+        realname = realname[len(subsystem+"_"):]
+
+    build_name = "%s_module_%s" % (subsystem, realname)
 
     realname = bld.make_libname(realname)
     while realname.startswith("lib"):
@@ -501,6 +505,7 @@ def SAMBA_MODULE(bld, modname, source,
                       local_include=local_include,
                       global_include=global_include,
                       vars=vars,
+                      bundled_name=build_name,
                       link_name=build_link_name,
                       install_path="${MODULESDIR}/%s" % subsystem,
                       pyembed=pyembed,


-- 
Samba Shared Repository