From e2a2c717573fda174a93f823c1c4bccf214052c0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 21 Oct 2010 08:54:36 +1100 Subject: [PATCH] waf: cope with libraries with a specified version number this fixes a problem with libnss_winbind.so.2. Thanks to Jelmer for spotting this. --- buildtools/wafsamba/samba_utils.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index e86056e7e80..4139aa13f7a 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -533,6 +533,9 @@ def map_shlib_extension(ctx, name, python=False): '''map a filename with a shared library extension of .so to the real shlib name''' if name is None: return None + if name[-1:].isdigit(): + # some libraries have specified versions in the wscript rule + return name (root1, ext1) = os.path.splitext(name) if python: (root2, ext2) = os.path.splitext(ctx.env.pyext_PATTERN) -- 2.34.1