summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-01-19 11:04:05 +1100
committerAndrew Tridgell <tridge@samba.org>2011-01-19 02:21:06 +0100
commit7d8e9706f7829feaef928424e76bd7df6e223762 (patch)
tree7df1d24c9cea9b5553dbe2fe367ae81098cbf459
parentbc0230be1d3d439fd5219a2123d4195b178870bc (diff)
downloadsamba-7d8e9706f7829feaef928424e76bd7df6e223762.tar.gz
samba-7d8e9706f7829feaef928424e76bd7df6e223762.tar.bz2
samba-7d8e9706f7829feaef928424e76bd7df6e223762.zip
waf: change private libraries to use the same soname as public libraries
See http://lists.samba.org/archive/samba-technical/2011-January/075816.html for a description of the reason behind this change Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org> Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Wed Jan 19 02:21:06 CET 2011 on sn-devel-104
-rw-r--r--buildtools/wafsamba/samba_bundled.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 27234fb055..2e3e1300e3 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -6,13 +6,11 @@ from samba_utils import *
def PRIVATE_NAME(bld, name, private_extension, private_library):
'''possibly rename a library to include a bundled extension'''
- if bld.env.DISABLE_SHARED or not private_extension:
- return name
- if name in bld.env.PRIVATE_EXTENSION_EXCEPTION and not private_library:
- return name
- extension = getattr(bld.env, 'PRIVATE_EXTENSION', '')
- if extension:
- return name + '-' + extension
+
+ # we now use the same private name for libraries as the public name.
+ # see http://git.samba.org/?p=tridge/junkcode.git;a=tree;f=shlib for a
+ # demonstration that this is the right thing to do
+ # also see http://lists.samba.org/archive/samba-technical/2011-January/075816.html
return name