sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

waf: Factor checking for undefined symbol flags out into separate method.

Browse Source 
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Nov 13 19:38:38 CET 2011 on sn-devel-104
This commit is contained in:
Jelmer Vernooij 2011-11-13 18:01:09 +01:00
parent af5c6fba68
commit 86afe83d86
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buildtools/wafsamba/samba_autoconf.py
View File

@ -712,3 +712,15 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
preproc.recursion_limit = 1 preproc.recursion_limit = 1
# in either case we don't need to scan system includes # in either case we don't need to scan system includes
preproc.go_absolute = False preproc.go_absolute = False
@conf
def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
# we don't want any libraries or modules to rely on runtime
# resolution of symbols
if sys.platform != "openbsd4":
conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
if sys.platform != "openbsd4" and conf.env.undefined_ignore_ldflags == []:
if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']

2
lib/ldb/wscript
View File

@ -75,6 +75,8 @@ def configure(conf):
conf.SAMBA_CONFIG_H() conf.SAMBA_CONFIG_H()
conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
def build(bld): def build(bld):
bld.RECURSE('lib/tdb_compat') bld.RECURSE('lib/tdb_compat')
bld.RECURSE('lib/tevent') bld.RECURSE('lib/tevent')

2
lib/talloc/wscript
View File

@ -67,6 +67,8 @@ def configure(conf):
conf.SAMBA_CONFIG_H() conf.SAMBA_CONFIG_H()
conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
def build(bld): def build(bld):
bld.RECURSE('lib/replace') bld.RECURSE('lib/replace')

2
lib/tdb/wscript
View File

@ -55,6 +55,8 @@ def configure(conf):
conf.SAMBA_CONFIG_H() conf.SAMBA_CONFIG_H()
conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
def build(bld): def build(bld):
bld.RECURSE('lib/replace') bld.RECURSE('lib/replace')

2
lib/tevent/wscript
View File

@ -58,6 +58,8 @@ def configure(conf):
conf.SAMBA_CONFIG_H() conf.SAMBA_CONFIG_H()
conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
def build(bld): def build(bld):
bld.RECURSE('lib/replace') bld.RECURSE('lib/replace')
bld.RECURSE('lib/talloc') bld.RECURSE('lib/talloc')

10
wscript
View File

@ -101,15 +101,7 @@ def configure(conf):
conf.RECURSE('selftest') conf.RECURSE('selftest')
conf.RECURSE('source3') conf.RECURSE('source3')
# we don't want any libraries or modules to rely on runtime conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
# resolution of symbols
if sys.platform != "openbsd4":
conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
if sys.platform != "openbsd4" and conf.env.undefined_ignore_ldflags == []:
if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
# gentoo always adds this. We want our normal build to be as # gentoo always adds this. We want our normal build to be as
# strict as the strictest OS we support, so adding this here # strict as the strictest OS we support, so adding this here