diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-21 08:54:36 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-21 19:03:24 +1100 |
| commit | e2a2c717573fda174a93f823c1c4bccf214052c0 (patch) | |
| tree | 9f10f7955190e07ed3f2e98d7b5b28fd6ab8ea41 | |
| parent | aa88884d37915ac06ed33766e6ad7460d1306d62 (diff) | |
| download | samba-e2a2c717573fda174a93f823c1c4bccf214052c0.tar.gz samba-e2a2c717573fda174a93f823c1c4bccf214052c0.tar.bz2 samba-e2a2c717573fda174a93f823c1c4bccf214052c0.zip | |
waf: cope with libraries with a specified version number
this fixes a problem with libnss_winbind.so.2. Thanks to Jelmer for
spotting this.
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index e86056e7e8..4139aa13f7 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) |