summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-12-17 21:53:42 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-12-18 00:47:06 +0100
commit03fbf9ea0babcaca3e751fa6d96981ef1e3805e7 (patch)
treeee8419284e0a2b95fb49bfeba2e82c3dff2728a7 /source4
parent2f75b53e8058f80dd7e5cba61e55271f40a8a338 (diff)
downloadsamba-03fbf9ea0babcaca3e751fa6d96981ef1e3805e7.tar.gz
samba-03fbf9ea0babcaca3e751fa6d96981ef1e3805e7.tar.bz2
samba-03fbf9ea0babcaca3e751fa6d96981ef1e3805e7.zip
heimdal_build: Simplify HEIMDAL_LIBRARY - version_script files are now taken from upstream rather than generated.
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/wscript_build17
1 files changed, 2 insertions, 15 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 1a4723d2f8..e97867cab4 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -202,8 +202,7 @@ def HEIMDAL_GENERATOR(name, rule, source='', target='',
name=name)
-def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='',
- version_script=None):
+def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes='', cflags=''):
'''define a Heimdal library'''
obj_target = libname + '.objlist'
@@ -236,18 +235,6 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='',
bundled_name = libname
version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
- 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,
- rule="echo %s \{ global: \*\; \}\; > ${TGT}" % namespace,
- 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'
bld.set_group('libraries')
@@ -263,7 +250,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='',
ldflags = ldflags,
vars = [version],
private_library = bundled_build,
- version_script = version_script,
+ version_script = heimdal_path(version_script),
)