From 3858b5db8be50dda5d994ecc8863b32a150a2528 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 31 May 2010 02:43:17 +0200 Subject: s4-waf: sanitize library names like the old build system did, only add -samba4 suffix for libraries that are bundled. --- buildtools/wafsamba/wafsamba.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'buildtools') 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) -- cgit