diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-12-17 19:38:12 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-12-17 19:38:12 +0100 |
| commit | c09d4b85b594fd16759037b2a3a7231c76b1e45c (patch) | |
| tree | 0752a49ed180249e2ac61af0c811d1f966467f06 | |
| parent | 402d622c0c4f501ab7085848cec135a8ff4d8a4c (diff) | |
| download | samba-c09d4b85b594fd16759037b2a3a7231c76b1e45c.tar.gz samba-c09d4b85b594fd16759037b2a3a7231c76b1e45c.tar.bz2 samba-c09d4b85b594fd16759037b2a3a7231c76b1e45c.zip | |
wafsamba: Specify full vscript path so non-autogenerated files are possible, too.
| -rw-r--r-- | buildtools/wafsamba/samba_install.py | 2 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 1 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_build | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py index 3c24679a72..5902d731f6 100644 --- a/buildtools/wafsamba/samba_install.py +++ b/buildtools/wafsamba/samba_install.py @@ -156,7 +156,7 @@ def apply_vscript(self): if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script', ''): self.env.append_value('LINKFLAGS', "-Wl,--version-script=%s" % - os.path.join(self.path.abspath(self.env), self.version_script)) + self.version_script) self.version_script = None diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index d92c90fb0e..92041040c2 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -219,6 +219,7 @@ def SAMBA_LIBRARY(bld, libname, source, # 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)) + vscript = os.path.join(bld.path.abspath(bld.env), vscript) bld.SET_BUILD_GROUP(group) t = bld( diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index f8afe96f1e..205b9c1359 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -236,7 +236,9 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='', bundled_name = libname version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION) - if bld.env.HAVE_LD_VERSION_SCRIPT: + if version_script: + version_script = heimdal_path(version_script) + elif bld.env.HAVE_LD_VERSION_SCRIPT: version_script = "%s.vscript" % libname namespace = version.replace("-","_").replace("+","_").upper(), HEIMDAL_GENERATOR(version_script, @@ -244,6 +246,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='', group='vscripts', target=version_script) deps.append(version_script) + version_script = os.path.join(bld.path.abspath(bld.env), version_script) features = 'cc cshlib symlink_lib install_lib' |