summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2015-01-17 00:24:53 +0100
committerStefan Metzmacher <metze@samba.org>2015-01-19 02:24:03 +0100
commit7668e457a6463fb2c1d7499659f37d10ca322190 (patch)
treefe50864b053ae810e0f4a18da330a959540d9095 /buildtools
parent691f3531baf68248e6423594121b134e19e79adb (diff)
downloadsamba-7668e457a6463fb2c1d7499659f37d10ca322190.tar.gz
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@samba.org> Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/wafsamba.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 82a9d6fcfe9..fb5934df44d 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: