[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Tue Apr 13 01:37:42 MDT 2010
The branch, master has been updated
via ab9e504... talloc-waf: added the manpage generation and talloc1-compat generation
via 64f860e... build: added autoconf compatible configure options
from 6661ecb... s4:CLDAP - "fill_netlogon_samlogon_reponse" - check for out of memory
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ab9e5047d747115df9519ecb00f24d77d43e98ed
Author: Andrew Tridgell <tridge at samba.org>
Date: Tue Apr 13 17:32:14 2010 +1000
talloc-waf: added the manpage generation and talloc1-compat generation
this allows the RPM spec file to be used with only a tiny mod (using
autogen-waf.sh instead of autogen.sh and using ln -sf for the library
links instead of ln -s)
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit 64f860e96a7662379ff5b9edc2b402631ac6fb66
Author: Andrew Tridgell <tridge at samba.org>
Date: Tue Apr 13 17:27:52 2010 +1000
build: added autoconf compatible configure options
This adds --build, --host, --program-prefix and
--disable-dependency-tracking. All we do with them is check them for sanity
and throw an error if (for example) the user tries a cross-compile using
these options
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wscript | 27 +++++++++++++++++++++++++++
lib/talloc/wscript | 35 ++++++++++++++++++++++++++++++++++-
2 files changed, 61 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 87e7070..a395bfe 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -5,6 +5,7 @@
import sys, wafsamba
import Options, os, preproc
from samba_utils import *
+from optparse import SUPPRESS_HELP
def set_options(opt):
opt.tool_options('compiler_cc')
@@ -78,6 +79,21 @@ def set_options(opt):
help=("set host compiler when cross compiling"),
action='store', dest='HOSTCC', default=False)
+ # we use SUPPRESS_HELP for these, as they are ignored, and are there only
+ # to allow existing RPM spec files to work
+ opt.add_option('--build',
+ help=SUPPRESS_HELP,
+ action='store', dest='AUTOCONF_BUILD', default='')
+ opt.add_option('--host',
+ help=SUPPRESS_HELP,
+ action='store', dest='AUTOCONF_HOST', default='')
+ opt.add_option('--program-prefix',
+ help=SUPPRESS_HELP,
+ action='store', dest='AUTOCONF_PROGRAM_PREFIX', default='')
+ opt.add_option('--disable-dependency-tracking',
+ help=SUPPRESS_HELP,
+ action='store_true', dest='AUTOCONF_DISABLE_DEPENDENCY_TRACKING', default=False)
+
@wafsamba.runonce
def configure(conf):
@@ -120,6 +136,17 @@ def configure(conf):
conf.env.CROSS_EXECUTE = Options.options.CROSS_EXECUTE
conf.env.HOSTCC = Options.options.HOSTCC
+ conf.env.AUTOCONF_BUILD = Options.options.AUTOCONF_BUILD
+ conf.env.AUTOCONF_HOST = Options.options.AUTOCONF_HOST
+ conf.env.AUTOCONF_PROGRAM_PREFIX = Options.options.AUTOCONF_PROGRAM_PREFIX
+
+ if conf.env.AUTOCONF_BUILD != conf.env.AUTOCONF_HOST:
+ Logs.error('ERROR: Mismatch between --build and --host. Please use --cross-compile instead')
+ sys.exit(1)
+ if conf.env.AUTOCONF_PROGRAM_PREFIX:
+ Logs.error('ERROR: --program-prefix not supported')
+ sys.exit(1)
+
# see if we can compile and run a simple C program
conf.CHECK_CODE('printf("hello world\\n")',
define='HAVE_SIMPLE_C_PROG',
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 7dc12c5..55f0e2c 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -3,6 +3,7 @@
APPNAME = 'talloc'
VERSION = '2.0.2'
+
blddir = 'bin'
import os, sys
@@ -15,7 +16,7 @@ sys.path.insert(0, srcdir + '/buildtools/wafsamba')
import sys
sys.path.insert(0, srcdir+"/buildtools/wafsamba")
-import wafsamba, samba_dist
+import wafsamba, samba_dist, Options
# setup what directories to put in a tarball
samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools')
@@ -25,6 +26,9 @@ def set_options(opt):
opt.BUILTIN_DEFAULT('replace')
opt.BUNDLED_EXTENSION_DEFAULT('talloc', noextenion='talloc')
opt.RECURSE('lib/replace')
+ opt.add_option('--enable-talloc-compat1',
+ help=("Build talloc 1.x.x compat library [False]"),
+ action="store_true", dest='TALLOC_COMPAT1', default=False)
def configure(conf):
conf.RECURSE('lib/replace')
@@ -35,6 +39,11 @@ def configure(conf):
conf.env.standalone_talloc = conf.IN_LAUNCH_DIR()
+ conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
+
+ if conf.env.standalone_talloc:
+ conf.find_program('xsltproc', var='XSLTPROC')
+
conf.SAMBA_CONFIG_H()
@@ -43,11 +52,19 @@ def build(bld):
bld.RECURSE('lib/replace')
if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'):
+
bld.SAMBA_LIBRARY('talloc',
'talloc.c',
deps='replace',
vnum=VERSION)
+ # should we also install the symlink to libtalloc1.so here?
+ bld.SAMBA_LIBRARY('talloc-compat1',
+ 'talloc.c compat/talloc_compat1.c',
+ deps='replace',
+ enabled = bld.env.TALLOC_COMPAT1,
+ vnum=VERSION)
+
if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
# s4 already has the talloc testsuite builtin to smbtorture
bld.SAMBA_BINARY('talloc_testsuite',
@@ -59,6 +76,22 @@ def build(bld):
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
bld.env.TALLOC_VERSION = VERSION
bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
+ bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
+
+ if bld.env.XSLTPROC:
+ bld.env.TALLOC_MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
+ bld.env.TALLOC_WEB_XSL = 'http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl'
+ bld.SAMBA_GENERATOR('talloc.3',
+ source='talloc.3.xml',
+ target='talloc.3',
+ rule='${XSLTPROC} -o ${TGT} ${TALLOC_MAN_XSL} ${SRC}'
+ )
+ bld.SAMBA_GENERATOR('talloc.3.html',
+ source='talloc.3.xml',
+ target='talloc.3.html',
+ rule='${XSLTPROC} -o ${TGT} ${TALLOC_WEB_XSL} ${SRC}'
+ )
+ bld.INSTALL_FILES('${MANDIR}/man3', 'talloc.3')
def test(ctx):
--
Samba Shared Repository
More information about the samba-cvs
mailing list