summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-12-17 18:42:34 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-12-17 18:42:34 +0100
commit85299bea65e152b4423ee40dd7f241189d52c6af (patch)
treefccca61714649129938dc230cf1d1f53122d093d
parent4e9d67b7c0a6fb3de56a0703ba1479360364071c (diff)
downloadsamba-85299bea65e152b4423ee40dd7f241189d52c6af.tar.gz
samba-85299bea65e152b4423ee40dd7f241189d52c6af.tar.bz2
samba-85299bea65e152b4423ee40dd7f241189d52c6af.zip
heimdal_build: Simplify library handling.
-rw-r--r--buildtools/wafsamba/wafsamba.py2
-rw-r--r--source4/heimdal_build/wscript_build29
2 files changed, 13 insertions, 18 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 19ebe23b60..40dae9bd0a 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -226,7 +226,7 @@ def SAMBA_LIBRARY(bld, libname, source,
source = [],
target = bundled_name,
depends_on = depends_on,
- samba_ldflags = ldflags,
+ samba_ldflags = ldflags,
samba_deps = deps,
samba_includes = includes,
local_include = local_include,
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 16af81acc3..77165e61a8 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import os, Utils, Build
+import os, Utils
from samba_utils import SET_TARGET_TYPE
from samba_autoconf import CURRENT_CFLAGS
@@ -202,10 +202,7 @@ def HEIMDAL_GENERATOR(name, rule, source='', target='',
name=name)
-def HEIMDAL_LIBRARY(libname, source, deps, vnum,
- includes='',
- cflags='',
- private_library=True):
+def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags=''):
'''define a Heimdal library'''
obj_target = libname + '.objlist'
@@ -229,16 +226,14 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
ldflags = []
- if not private_library:
- # Sanitize the library name
- bundled_name = libname.lower().replace('_', '-')
- while bundled_name.startswith("lib"):
- bundled_name = bundled_name[3:]
- version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION.split(".")[0])
- else:
+ # FIXME: When building upstream heimdal, we should not be adding this
+ # suffix.
+ bundled_build = True
+ if bundled_build:
bundled_name = libname + '-samba4'
- vnum = Utils.g_module.VERSION[0]
- version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
+ else:
+ bundled_name = libname
+ version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
if bld.env.HAVE_LD_VERSION_SCRIPT:
vscript = "%s.vscript" % libname
@@ -262,9 +257,9 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
vnum = vnum,
install_path = None,
name = libname,
- ldflags = ldflags,
- vars = [version],
- private_library = private_library
+ ldflags = ldflags,
+ vars = [version],
+ private_library = bundled_build,
)