diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-31 02:43:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-31 03:28:42 +0200 |
| commit | 3858b5db8be50dda5d994ecc8863b32a150a2528 (patch) | |
| tree | 48b8f4739c46dad9dce4799386f5d01a45b3f726 /buildtools | |
| parent | 17ad28c5826590a973fe1f0e1c6be0d18f1ec458 (diff) | |
| download | samba-3858b5db8be50dda5d994ecc8863b32a150a2528.tar.gz samba-3858b5db8be50dda5d994ecc8863b32a150a2528.tar.bz2 samba-3858b5db8be50dda5d994ecc8863b32a150a2528.zip | |
s4-waf: sanitize library names like the old build system did, only add
-samba4 suffix for libraries that are bundled.
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 4dac6fb290..eb5aa91d2d 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -115,6 +115,7 @@ def SAMBA_LIBRARY(bld, libname, source, abi_file=None, abi_match=None, hide_symbols=False, + is_bundled=False, enabled=True): '''define a Samba library''' @@ -163,8 +164,11 @@ def SAMBA_LIBRARY(bld, libname, source, deps = TO_LIST(deps) deps.append(obj_target) - if target_type == 'PYTHON' or realname: - bundled_name = libname + if target_type == 'PYTHON' or realname or not is_bundled: + # Sanitize the library name + bundled_name = libname.lower().replace('_', '-') + while bundled_name.startswith("lib"): + bundled_name = bundled_name[3:] else: bundled_name = BUNDLED_NAME(bld, libname, bundled_extension) |