[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Wed May 5 08:16:10 MDT 2010
The branch, master has been updated
via 10469d6... s3-build: don't rebuild/link on every make run
via ed2941b... build: added configure test for inline
via 20d7770... build: update version of waf
via 3d2819b... build: use the wrapper commands in testwaf.sh
via f8120ab... build: added a distcheck target
via 47fb7df... build: mark cloned task generators as not posted
via fa172c4... build: exit with an error if waf configure fails
from b4c46bd... libwbclient: Fixed doxygen errors.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 10469d6606b79894f7f7cf83fb64002698a7c023
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed May 5 16:12:59 2010 +0200
s3-build: don't rebuild/link on every make run
commit ed2941ba3d59ca7f043583a36582e2d5cdee65fe
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed May 5 15:16:26 2010 +0200
build: added configure test for inline
commit 20d77705cece08ae5bebeca77db1f467d436748e
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed May 5 14:12:26 2010 +0200
build: update version of waf
this fixes a slow configure problem on HPUX
commit 3d2819bd8605b02f2b1053ed0dabb906e9b78db3
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed May 5 14:11:56 2010 +0200
build: use the wrapper commands in testwaf.sh
this ensures they are well tested
commit f8120ab6977074266cce6b665ed6aa3ef15953c2
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed May 5 14:09:37 2010 +0200
build: added a distcheck target
commit 47fb7dfd1c0b5917219a199d45b3d2fdded954c5
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed May 5 14:09:26 2010 +0200
build: mark cloned task generators as not posted
this solves an incompatibility with a newer version of waf from svn
commit fa172c494f8d78838a33820e413f0528f83b2db9
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed May 5 12:41:07 2010 +0200
build: exit with an error if waf configure fails
We don't want configure in the build farm to show green when it fails
-----------------------------------------------------------------------
Summary of changes:
buildtools/bin/waf-svn | Bin 107839 -> 107924 bytes
buildtools/scripts/Makefile.waf | 3 +++
buildtools/scripts/configure.waf | 4 ++--
buildtools/testwaf.sh | 10 +++++-----
buildtools/wafsamba/samba_conftests.py | 24 ++++++++++++++++++++++++
buildtools/wafsamba/samba_install.py | 1 +
buildtools/wafsamba/wscript | 2 ++
source3/Makefile.in | 4 ++--
8 files changed, 39 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/bin/waf-svn b/buildtools/bin/waf-svn
index 08b64be..25f0406 100755
Binary files a/buildtools/bin/waf-svn and b/buildtools/bin/waf-svn differ
diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf
index e40b635..1345f19 100644
--- a/buildtools/scripts/Makefile.waf
+++ b/buildtools/scripts/Makefile.waf
@@ -20,6 +20,9 @@ quicktest:
dist:
$(WAF) dist
+distcheck:
+ $(WAF) distcheck
+
clean:
$(WAF) clean
diff --git a/buildtools/scripts/configure.waf b/buildtools/scripts/configure.waf
index 342f4c2..a7d8d1d 100755
--- a/buildtools/scripts/configure.waf
+++ b/buildtools/scripts/configure.waf
@@ -9,6 +9,6 @@ WAF=BUILDTOOLS/bin/waf
JOBS=1
export JOBS
-cd BUILDPATH
-$WAF configure "$@"
+cd BUILDPATH || exit 1
+$WAF configure "$@" || exit 1
cd $PREVPATH
diff --git a/buildtools/testwaf.sh b/buildtools/testwaf.sh
index b6f8db1..7a3f1bf 100755
--- a/buildtools/testwaf.sh
+++ b/buildtools/testwaf.sh
@@ -21,12 +21,12 @@ for d in $tests; do
pushd $d
rm -rf bin
type waf
+ ./autogen-waf.sh
waf dist
- waf configure -C --enable-developer --prefix=$PREFIX
- time waf build
- time waf build
- waf install
- waf distcheck
+ ./configure -C --enable-developer --prefix=$PREFIX
+ time make
+ make install
+ make distcheck
case $d in
"source4/lib/ldb")
ldd bin/ldbadd
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index e709929..a5c1b38 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -279,3 +279,27 @@ def CHECK_UNAME(conf):
msg="Checking uname %s type" % v):
ret = False
return ret
+
+ at conf
+def CHECK_INLINE(conf):
+ '''check for the right value for inline'''
+ conf.COMPOUND_START('Checking for inline')
+ for i in ['inline', '__inline__', '__inline']:
+ ret = conf.CHECK_CODE('''
+ typedef int foo_t;
+ static %s foo_t static_foo () {return 0; }
+ %s foo_t foo () {return 0; }''' % (i, i),
+ define='INLINE_MACRO',
+ addmain=False,
+ link=False)
+ if ret:
+ if i != 'inline':
+ conf.DEFINE('inline', i, quote=False)
+ break
+ if not ret:
+ conf.COMPOUND_END(ret)
+ else:
+ conf.COMPOUND_END(i)
+ return ret
+
+
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 9030c19..63dab16 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -75,6 +75,7 @@ def install_library(self):
# target, which has different ldflags
self.done_install_library = True
t = self.clone('default')
+ t.posted = False
t.target += '.inst'
self.env.RPATH = build_ldflags
else:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 0413bb4..c8872eb 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -220,6 +220,8 @@ def configure(conf):
# we should use the PIC options in waf instead
conf.ADD_CFLAGS('-fPIC', testflags=True)
+ conf.CHECK_INLINE()
+
# check for pkgconfig
conf.check_cfg(atleast_pkgconfig_version='0.0.0')
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6b2b184..b187dbd 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1377,7 +1377,7 @@ all:: SHOWFLAGS basics libs $(SBIN_PROGS) $(BIN_PROGS) \
$(MODULES) $(NSS_MODULES) $(PAM_MODULES) \
$(EXTRA_ALL_TARGETS)
-basics::
+basics:: samba3-idl
nss_modules:: $(NSS_MODULES)
@@ -1522,7 +1522,7 @@ pch::
$(PRECOMPILED_HEADER): $(srcdir)/include/includes.h
$(COMPILE)
-BINARY_PREREQS = bin/.dummy samba3-idl
+BINARY_PREREQS = bin/.dummy
# These dependencies are only approximately correct: we want to make
# sure Samba's paths are updated if ./configure is re-run. Really it
--
Samba Shared Repository
More information about the samba-cvs
mailing list