git.samba.org
/
abartlet
/
samba.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa88884
)
waf: cope with libraries with a specified version number
author
Andrew Tridgell
<tridge@samba.org>
Wed, 20 Oct 2010 21:54:36 +0000
(08:54 +1100)
committer
Andrew Tridgell
<tridge@samba.org>
Thu, 21 Oct 2010 08:03:24 +0000
(19:03 +1100)
this fixes a problem with libnss_winbind.so.2. Thanks to Jelmer for
spotting this.
buildtools/wafsamba/samba_utils.py
patch
|
blob
|
history
diff --git
a/buildtools/wafsamba/samba_utils.py
b/buildtools/wafsamba/samba_utils.py
index e86056e7e803a5c6d993d1b8c6d944efaa6b88bb..4139aa13f7a4ad0a75169f5f2307bf924ec2bcf3 100644
(file)
--- 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)