diff options
author | Stefan Metzmacher <metze@samba.org> | 2015-01-17 00:24:53 +0100 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2015-01-27 11:02:16 +0100 |
commit | f9fbb92f20d59539c544b2f8a2eddc309ca6e539 (patch) | |
tree | 7896aed804e288a7bbb03ae07c976a9e589aa1f9 | |
parent | 23a4ba874011814580e81bbb811c7a401e7868a6 (diff) | |
download | samba-f9fbb92f20d59539c544b2f8a2eddc309ca6e539.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>
(cherry picked from commit 7668e457a6463fb2c1d7499659f37d10ca322190)
-rw-r--r-- | buildtools/wafsamba/wafsamba.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 7a5e23c2e88..cbc0f44c636 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: |