[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Sun May 30 19:29:29 MDT 2010
The branch, master has been updated
via 3858b5d... s4-waf: sanitize library names like the old build system did, only add -samba4 suffix for libraries that are bundled.
from 17ad28c... s3: use PICFLAG instead of PIE_FLAGS
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3858b5db8be50dda5d994ecc8863b32a150a2528
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon May 31 02:43:17 2010 +0200
s4-waf: sanitize library names like the old build system did, only add
-samba4 suffix for libraries that are bundled.
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 8 ++++++--
lib/popt/wscript | 3 ++-
lib/talloc/wscript | 4 ++--
lib/tdb/wscript | 2 +-
lib/tevent/wscript | 3 ++-
5 files changed, 13 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 4dac6fb..eb5aa91 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -115,6 +115,7 @@ def SAMBA_LIBRARY(bld, libname, source,
abi_file=None,
abi_match=None,
hide_symbols=False,
+ is_bundled=False,
enabled=True):
'''define a Samba library'''
@@ -163,8 +164,11 @@ def SAMBA_LIBRARY(bld, libname, source,
deps = TO_LIST(deps)
deps.append(obj_target)
- if target_type == 'PYTHON' or realname:
- bundled_name = libname
+ if target_type == 'PYTHON' or realname or not is_bundled:
+ # Sanitize the library name
+ bundled_name = libname.lower().replace('_', '-')
+ while bundled_name.startswith("lib"):
+ bundled_name = bundled_name[3:]
else:
bundled_name = BUNDLED_NAME(bld, libname, bundled_extension)
diff --git a/lib/popt/wscript b/lib/popt/wscript
index 425402e..7d236dd 100644
--- a/lib/popt/wscript
+++ b/lib/popt/wscript
@@ -14,5 +14,6 @@ def build(bld):
bld.SAMBA_LIBRARY('popt',
source='findme.c popt.c poptconfig.c popthelp.c poptparse.c',
- cflags='-DDBL_EPSILON=__DBL_EPSILON__'
+ cflags='-DDBL_EPSILON=__DBL_EPSILON__',
+ is_bundled=True,
)
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 3a87506..61930f6 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -60,14 +60,14 @@ def build(bld):
abi_file='ABI/talloc-%s.sigs' % VERSION,
abi_match='talloc* _talloc*',
hide_symbols=True,
- vnum=VERSION)
+ vnum=VERSION, is_bundled=True)
# should we also install the symlink to libtalloc1.so here?
bld.SAMBA_LIBRARY('talloc-compat1',
'compat/talloc_compat1.c',
deps='talloc',
enabled = bld.env.TALLOC_COMPAT1,
- vnum=VERSION)
+ vnum=VERSION, is_bundled=True)
if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
# s4 already has the talloc testsuite builtin to smbtorture
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 70eb8cf..084be40 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -69,7 +69,7 @@ def build(bld):
abi_file='ABI/tdb-%s.sigs' % VERSION,
abi_match='tdb_*',
hide_symbols=True,
- vnum=VERSION)
+ vnum=VERSION, is_bundled=not bld.env.standalone_tdb)
bld.SAMBA_BINARY('tdbtorture',
'tools/tdbtorture.c',
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index e61133c..46ac620 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -57,7 +57,8 @@ def build(bld):
enabled= not bld.CONFIG_SET('USING_SYSTEM_TEVENT'),
abi_file='ABI/tevent-%s.sigs' % VERSION,
abi_match='tevent_* _tevent_*',
- vnum=VERSION)
+ vnum=VERSION,
+ is_bundled=not bld.env.standalone_tevent)
if bld.env.standalone_tevent:
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
--
Samba Shared Repository
More information about the samba-cvs
mailing list