From 3173faf4aa18308832c7c8a983e3ff556d2cb5ba Mon Sep 17 00:00:00 2001 From: Pawel Tomulik Date: Sat, 19 Sep 2015 02:09:53 +0200 Subject: support free-form SHLIBVERSION/LDMODULEVERSION --- src/engine/SCons/Tool/gnulink.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/engine/SCons/Tool/gnulink.py b/src/engine/SCons/Tool/gnulink.py index e5e8818..0c5087b 100644 --- a/src/engine/SCons/Tool/gnulink.py +++ b/src/engine/SCons/Tool/gnulink.py @@ -103,7 +103,11 @@ def _versioned_lib_symlinks(env, libnode, version, prefix, suffix, name_func, so link0 = env.fs.File(soname, linkdir) link1 = env.fs.File(name, linkdir) - symlinks = [ (link0, libnode), (link1, link0) ] + # This allows anything in SHLIBVERSION (especially SHLIBVERSION=1). + if link0 == libnode: + symlinks = [ (link1, libnode) ] + else: + symlinks = [ (link0, libnode), (link1, link0) ] if Verbose: print "_versioned_lib_symlinks: return symlinks=%r" % SCons.Tool.StringizeLibSymlinks(symlinks) -- cgit v0.12