[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Sun Oct 24 19:13:02 MDT 2010
The branch, master has been updated
via db73b4a waf: moved the -Wl,-no-undefined flags to source4 and ldb
via 986a00d s3-waf: fixed paths in s3 waf build for rpc_server
via ec98bb5 s3-waf: fixed waf configure for recent changes
from 14686e4 libcli/security Remove unused sec_acl_equal()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit db73b4a2c129eeb7dddcd2466f8b7b485d66c1d9
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Oct 25 11:29:12 2010 +1100
waf: moved the -Wl,-no-undefined flags to source4 and ldb
moved it out of the general waf build as the s3 waf build cannot yet
handle linking with -Wl,-no-undefined
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
Autobuild-User: Andrew Tridgell <tridge at samba.org>
Autobuild-Date: Mon Oct 25 01:12:15 UTC 2010 on sn-devel-104
commit 986a00dcef2bc2c9cf00c987555e0f4ff646437d
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Oct 25 10:27:14 2010 +1100
s3-waf: fixed paths in s3 waf build for rpc_server
paths in waf rules are relative
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit ec98bb55c6fe06f9ca698e52dda41b3cff2f95b5
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Oct 25 10:14:41 2010 +1100
s3-waf: fixed waf configure for recent changes
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_autoconf.py | 2 --
source3/rpc_server/wscript_build | 28 ++++++++++++++--------------
source3/wscript | 2 +-
source4/lib/ldb/wscript | 4 ++++
source4/wscript | 4 ++++
5 files changed, 23 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index ea2ef09..34acfdd 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -577,8 +577,6 @@ def SAMBA_CONFIG_H(conf, path=None):
# we add these here to ensure that -Wstrict-prototypes is not set during configure
conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k',
testflags=True)
- conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
-
if Options.options.picky_developer:
conf.ADD_CFLAGS('-Werror', testflags=True)
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 7ad35cc..59c19d5 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -1,22 +1,22 @@
#!/usr/bin/env python
-RPC_LSARPC_SRC = '''srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c'''
-RPC_NETLOGON_SRC = '''srv_netlog_nt.c ../librpc/gen_ndr/srv_netlogon.c'''
-RPC_SAMR_SRC = '''srv_samr_nt.c ../librpc/gen_ndr/srv_samr.c
+RPC_LSARPC_SRC = '''srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c'''
+RPC_NETLOGON_SRC = '''srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c'''
+RPC_SAMR_SRC = '''srv_samr_nt.c ../../librpc/gen_ndr/srv_samr.c
srv_samr_util.c
srv_samr_chgpasswd.c'''
-RPC_INITSHUTDOWN_SRC = '''srv_initshutdown_nt.c ../librpc/gen_ndr/srv_initshutdown.c'''
-RPC_WINREG_SRC = '''srv_winreg_nt.c ../librpc/gen_ndr/srv_winreg.c'''
-RPC_DSSETUP_SRC = '''srv_dssetup_nt.c ../librpc/gen_ndr/srv_dssetup.c'''
-RPC_SRVSVC_SRC = '''srv_srvsvc_nt.c ../librpc/gen_ndr/srv_srvsvc.c'''
-RPC_WKSSVC_SRC = '''srv_wkssvc_nt.c ../librpc/gen_ndr/srv_wkssvc.c'''
-RPC_SVCCTL_SRC = '''srv_svcctl_nt.c ../librpc/gen_ndr/srv_svcctl.c'''
-RPC_NTSVCS_SRC = '''srv_ntsvcs_nt.c ../librpc/gen_ndr/srv_ntsvcs.c'''
-RPC_NETDFS_SRC = '''srv_dfs_nt.c ../librpc/gen_ndr/srv_dfs.c'''
-RPC_SPOOLSS_SRC = '''srv_spoolss_nt.c ../librpc/gen_ndr/srv_spoolss.c
+RPC_INITSHUTDOWN_SRC = '''srv_initshutdown_nt.c ../../librpc/gen_ndr/srv_initshutdown.c'''
+RPC_WINREG_SRC = '''srv_winreg_nt.c ../../librpc/gen_ndr/srv_winreg.c'''
+RPC_DSSETUP_SRC = '''srv_dssetup_nt.c ../../librpc/gen_ndr/srv_dssetup.c'''
+RPC_SRVSVC_SRC = '''srv_srvsvc_nt.c ../../librpc/gen_ndr/srv_srvsvc.c'''
+RPC_WKSSVC_SRC = '''srv_wkssvc_nt.c ../../librpc/gen_ndr/srv_wkssvc.c'''
+RPC_SVCCTL_SRC = '''srv_svcctl_nt.c ../../librpc/gen_ndr/srv_svcctl.c'''
+RPC_NTSVCS_SRC = '''srv_ntsvcs_nt.c ../../librpc/gen_ndr/srv_ntsvcs.c'''
+RPC_NETDFS_SRC = '''srv_dfs_nt.c ../../librpc/gen_ndr/srv_dfs.c'''
+RPC_SPOOLSS_SRC = '''srv_spoolss_nt.c ../../librpc/gen_ndr/srv_spoolss.c
srv_spoolss_util.c'''
-RPC_EVENTLOG_SRC = '''srv_eventlog_nt.c ../librpc/gen_ndr/srv_eventlog.c'''
-RPC_RPCECHO_SRC = '''srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
+RPC_EVENTLOG_SRC = '''srv_eventlog_nt.c ../../librpc/gen_ndr/srv_eventlog.c'''
+RPC_RPCECHO_SRC = '''srv_echo_nt.c ../../librpc/gen_ndr/srv_echo.c'''
bld.SAMBA_SUBSYSTEM('rpc',
source='srv_pipe_register.c',
diff --git a/source3/wscript b/source3/wscript
index d39bedb..20975f7 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -17,7 +17,7 @@ VERSION=version.STRING
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
- opt.BUNDLED_EXTENSION_DEFAULT('s3')
+ opt.PRIVATE_EXTENSION_DEFAULT('s3')
opt.RECURSE('../lib/replace')
opt.RECURSE('build')
opt.RECURSE('selftest')
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index fe46810..502d492 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -60,6 +60,10 @@ def configure(conf):
conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
+ # we don't want any libraries or modules to rely on runtime
+ # resolution of symbols
+ conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
+
conf.SAMBA_CONFIG_H()
def build(bld):
diff --git a/source4/wscript b/source4/wscript
index 10c53a3..c419c16 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -116,6 +116,10 @@ def configure(conf):
conf.RECURSE('../pidl')
conf.RECURSE('selftest')
+ # we don't want any libraries or modules to rely on runtime
+ # resolution of symbols
+ conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
+
# we don't want PYTHONDIR in config.h, as otherwise changing
# --prefix causes a complete rebuild
del(conf.env.defines['PYTHONDIR'])
--
Samba Shared Repository
More information about the samba-cvs
mailing list