diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-12-09 13:06:22 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-12-09 04:32:18 +0100 |
| commit | a6351e2bce396c18715f9002f3a416eb595b6cac (patch) | |
| tree | f0241b361c36ab02497de6bcc4b64985502b4658 | |
| parent | f3d36b13acec43cfde318f9dcfa6c88e8ef9230c (diff) | |
| download | samba-a6351e2bce396c18715f9002f3a416eb595b6cac.tar.gz samba-a6351e2bce396c18715f9002f3a416eb595b6cac.tar.bz2 samba-a6351e2bce396c18715f9002f3a416eb595b6cac.zip | |
waf: add a dependency between the library and its vscript
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu Dec 9 04:32:18 CET 2010 on sn-devel-104
| -rw-r--r-- | buildtools/wafsamba/samba_abi.py | 2 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py index d5376ca1e7..a4c9f68ccd 100644 --- a/buildtools/wafsamba/samba_abi.py +++ b/buildtools/wafsamba/samba_abi.py @@ -201,5 +201,5 @@ def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript): target=vscript) t.env.VERSION = version t.env.LIBNAME = libname - t.vars = [libname, version, vscript] + t.vars = ['LIBNAME', 'VERSION'] Build.BuildContext.ABI_VSCRIPT = ABI_VSCRIPT diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index ef5aaba771..fa910886a3 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -218,6 +218,8 @@ def SAMBA_LIBRARY(bld, libname, source, if version: bld.ABI_VSCRIPT(libname, abi_directory, version, vscript) 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)) bld.SET_BUILD_GROUP(group) t = bld( |