The branch, master has been updated
via a43a1d9 s3-selftest: support differing VFSLIBDIR in autoconf and
waf build.
via b4d398f s3-waf: add -Wl,--export-dynamic to LDFLAGS.
via cb15d73 nss_wrapper: make nss_wrapper.pl executeable.
from 61d9aa5 build: remove -no-undefined and -as-needed on openbsd
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a43a1d922611a0610f8d815285e91dff6d77d629
Author: Günther Deschner <g...@samba.org>
Date: Fri Dec 10 17:15:18 2010 +0100
s3-selftest: support differing VFSLIBDIR in autoconf and waf build.
With this change make test in the s3 waf build (w/o s4 smbtorture yet)
works!
Guenther
Autobuild-User: Günther Deschner <g...@samba.org>
Autobuild-Date: Mon Dec 13 13:06:05 CET 2010 on sn-devel-104
commit b4d398f8e3f5f073f0424395b792c1487a2f2ca8
Author: Günther Deschner <g...@samba.org>
Date: Thu Dec 9 15:44:30 2010 +0100
s3-waf: add -Wl,--export-dynamic to LDFLAGS.
Our binaries did not export symbols so e.g. smbd could not load vfs modules.
Patch from tridge.
We might remove this later on, once we decide to resolve all symbols and
fix all
dependencies in s3 modules.
Guenther
commit cb15d73c0bb8526b99f7f5067680a39bd8fbf03f
Author: Günther Deschner <g...@samba.org>
Date: Thu Dec 9 15:33:25 2010 +0100
nss_wrapper: make nss_wrapper.pl executeable.
Guenther
-----------------------------------------------------------------------
Summary of changes:
selftest/target/Samba3.pm | 2 +-
source3/Makefile.in | 1 +
source3/selftest/wscript | 1 +
source3/wscript | 2 ++
4 files changed, 5 insertions(+), 1 deletions(-)
mode change 100644 => 100755 lib/nss_wrapper/nss_wrapper.pl
Changeset truncated at 500 lines:
diff --git a/lib/nss_wrapper/nss_wrapper.pl b/lib/nss_wrapper/nss_wrapper.pl
old mode 100644
new mode 100755
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 3d1ae4e..279fc65 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -356,7 +356,7 @@ sub provision($$$$$$)
my $prefix_abs = abs_path($prefix);
my $bindir_abs = abs_path($self->{bindir});
- my $vfs_modulesdir_abs = $bindir_abs;
+ my $vfs_modulesdir_abs = ($ENV{VFSLIBDIR} or $bindir_abs);
my @dirs = ();
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 61ec157..1525888 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3413,6 +3413,7 @@ test:: all torture timelimit
NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \
SELFTESTDIR="$(selftestdir)"
SELFTESTPREFIX="$(selftest_prefix)" \
SOURCEDIR="$(srcdir)" \
+ VFSLIBDIR="$(builddir)/bin" \
RUN_FROM_BUILD_FARM="$(RUN_FROM_BUILD_FARM)" \
SUBUNIT_FORMATTER="$(SUBUNIT_FORMATTER)" \
PERL="$(PERL)" PYTHON="$(PYTHON)" \
diff --git a/source3/selftest/wscript b/source3/selftest/wscript
index b3139d5..0e3ee9e 100644
--- a/source3/selftest/wscript
+++ b/source3/selftest/wscript
@@ -120,6 +120,7 @@ def cmd_testonly(opt):
# tell build system where to find config.h
os.environ['CONFIG_H'] = 'bin/default/source3/include/config.h'
+ os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs')
st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')
if os.path.exists(st_done):
diff --git a/source3/wscript b/source3/wscript
index 2bf6fb8..c02f2a2 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -85,6 +85,8 @@ def configure(conf):
conf.RECURSE('../lib/zlib')
conf.RECURSE('../libcli/smbreadline')
+ conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
+
conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
conf.CHECK_FUNCS('getcwd fchown chmod fchmod mknod mknod64')
--
Samba Shared Repository
