summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-12-10 17:59:34 +1100
committerAndrew Tridgell <tridge@samba.org>2010-12-10 09:30:46 +0100
commit1b63c78693ab5d244006769c1b41ff37d990d1b2 (patch)
tree0f3c351dc21c1c8c29efc1f50e1a48a8420caf04
parent283686af75c4ca3b8317f04754dab64bbf9f64e8 (diff)
downloadsamba-1b63c78693ab5d244006769c1b41ff37d990d1b2.tar.gz
samba-1b63c78693ab5d244006769c1b41ff37d990d1b2.tar.bz2
samba-1b63c78693ab5d244006769c1b41ff37d990d1b2.zip
waf: the libXX.inst.so file also depends on the vscript
this fixes a problem with installed libraries not relinking after a git version change Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Fri Dec 10 09:30:46 CET 2010 on sn-devel-104
-rw-r--r--buildtools/wafsamba/wafsamba.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index fb68531353..3cb97c0723 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -215,6 +215,10 @@ def SAMBA_LIBRARY(bld, libname, source,
ldflags.append("-Wl,--version-script=%s/%s" % (bld.path.abspath(bld.env), vscript))
fullname = bld.env.shlib_PATTERN % bundled_name
bld.add_manual_dependency(bld.path.find_or_declare(fullname), bld.path.find_or_declare(vscript))
+ if Options.is_install:
+ # also make the .inst file depend on the vscript
+ instname = bld.env.shlib_PATTERN % (bundled_name + '.inst')
+ bld.add_manual_dependency(bld.path.find_or_declare(instname), bld.path.find_or_declare(vscript))
bld.SET_BUILD_GROUP(group)
t = bld(