diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-01-17 00:24:53 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-01-19 04:43:53 +0100 |
| commit | 47155641cb48d39d3ee7d8b8962f5ed6b23617d4 (patch) | |
| tree | a04c619fb6938f5dd0fa775696403632326e236b /buildtools | |
| parent | 4da20e2e31790ca54f17b4a6039c24b7b502ac5f (diff) | |
| download | samba-47155641cb48d39d3ee7d8b8962f5ed6b23617d4.tar.gz samba-47155641cb48d39d3ee7d8b8962f5ed6b23617d4.tar.xz samba-47155641cb48d39d3ee7d8b8962f5ed6b23617d4.zip | |
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@samba.org>
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Mon Jan 19 04:43:53 CET 2015 on sn-devel-104
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 5931b6803f..c05431568a 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -484,6 +484,8 @@ def SAMBA_MODULE(bld, modname, source, while realname.startswith(subsystem+"_"): realname = realname[len(subsystem+"_"):] + build_name = "%s_module_%s" % (subsystem, realname) + realname = bld.make_libname(realname) while realname.startswith("lib"): realname = realname[len("lib"):] @@ -503,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, |