[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Mon Apr 12 04:31:45 MDT 2010
The branch, master has been updated
via 6ccf232... s4:heimdal_build/wscript_build: avoid global deps for hostcc stuff
via 8921834... lib/replace/wscript: avoid global deps for LIBREPLACE_HOSTCC
via 4f73658... wafsamba: don't add global dependencies to hostcc targets
via 2a727ef... lib/replace/wscript: inline LIBREPLACE_EXT into 'replace' as the autoconf system does
via e6c31a4... s4:param/wscript_build: 'dl' is provides via 'replace'
via 783d2e9... lib/nss_wrapper/wscript_build: 'replace' already includes 'dl'
via dd38853... lib/replace/wscript: add dependency to 'dl'
via 2e26298... s4:heimdal_build/wscript: rename HEIMDAL_ROKEN_H => HEIMDAL_ROKEN_HOSTCC
via 14c0540... lib/replace/wscript: rename LIBREPLACE_H => LIBREPLACE_HOSTCC
via 8a00c56... wafsamba: allow passing 'use_hostcc' to SAMBA_SUBSYSTEM()
from 928fb86... s4-ldb: fixed a crash bug for non-UTF8 strings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6ccf2321cef9203bb80cb091700ea798095d094b
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 10:55:32 2010 +0200
s4:heimdal_build/wscript_build: avoid global deps for hostcc stuff
metze
commit 8921834be845638a1c1079e1c271254edec8bfc1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 10:55:02 2010 +0200
lib/replace/wscript: avoid global deps for LIBREPLACE_HOSTCC
metze
commit 4f73658544f988b1b495d1a84b7058fdace712ee
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 10:16:54 2010 +0200
wafsamba: don't add global dependencies to hostcc targets
metze
commit 2a727ef6e7bffcaad7438e288c952f6157e075de
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 09:47:49 2010 +0200
lib/replace/wscript: inline LIBREPLACE_EXT into 'replace' as the autoconf system does
metze
commit e6c31a4bcb1e7f56edcfccabd02a8096e3b5dd40
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 09:44:47 2010 +0200
s4:param/wscript_build: 'dl' is provides via 'replace'
metze
commit 783d2e9fe57f1390ff66a8c1bda6b82a22af3332
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 09:43:54 2010 +0200
lib/nss_wrapper/wscript_build: 'replace' already includes 'dl'
metze
commit dd38853b56f13d26353a1bee6ad3225f8f46c843
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 09:41:19 2010 +0200
lib/replace/wscript: add dependency to 'dl'
metze
commit 2e26298331a1c09c829b171f1f81a6b69fe51a56
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 09:34:39 2010 +0200
s4:heimdal_build/wscript: rename HEIMDAL_ROKEN_H => HEIMDAL_ROKEN_HOSTCC
metze
commit 14c05405cbae886ca741340f3cc2b148b3cd3ae4
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 09:33:42 2010 +0200
lib/replace/wscript: rename LIBREPLACE_H => LIBREPLACE_HOSTCC
metze
commit 8a00c566492943972798a96a9e23bc74083902ec
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 09:30:12 2010 +0200
wafsamba: allow passing 'use_hostcc' to SAMBA_SUBSYSTEM()
metze
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_deps.py | 3 ++-
buildtools/wafsamba/wafsamba.py | 13 ++++++++++---
lib/nss_wrapper/wscript_build | 2 +-
lib/replace/wscript | 16 +++++-----------
nsswitch/wscript_build | 4 ++--
source4/auth/ntlm/wscript_build | 2 +-
source4/heimdal_build/wscript_build | 25 ++++++++++++++++---------
source4/param/wscript_build | 2 +-
8 files changed, 38 insertions(+), 29 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 232ed34..cca2feb 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -323,7 +323,8 @@ def build_direct_deps(bld, tgt_list):
t.direct_libs = set()
t.direct_syslibs = set()
deps = t.samba_deps_extended
- deps.extend(global_deps)
+ if getattr(t, 'samba_use_global_deps', False):
+ deps.extend(global_deps)
for d in deps:
d = EXPAND_ALIAS(bld, d)
if d == t.sname: continue
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index e2d8052..386ed3c 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -197,7 +197,8 @@ def SAMBA_BINARY(bld, binname, source,
ldflags=None,
cflags='',
autoproto=None,
- use_hostcc=None,
+ use_hostcc=False,
+ use_global_deps=True,
compiler=None,
group='binaries',
manpages=None,
@@ -232,7 +233,9 @@ def SAMBA_BINARY(bld, binname, source,
autoproto = autoproto,
subsystem_name = subsystem_name,
needs_python = needs_python,
- local_include = local_include)
+ local_include = local_include,
+ use_hostcc = use_hostcc,
+ use_global_deps= use_global_deps)
bld.SET_BUILD_GROUP(group)
@@ -357,6 +360,8 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
local_include_first=True,
subsystem_name=None,
enabled=True,
+ use_hostcc=False,
+ use_global_deps=True,
vars=None,
needs_python=False):
'''define a Samba subsystem'''
@@ -393,7 +398,9 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
samba_includes = includes,
local_include = local_include,
local_include_first = local_include_first,
- samba_subsystem= subsystem_name
+ samba_subsystem= subsystem_name,
+ samba_use_hostcc = use_hostcc,
+ samba_use_global_deps = use_global_deps
)
if cflags_end is not None:
diff --git a/lib/nss_wrapper/wscript_build b/lib/nss_wrapper/wscript_build
index 4bb3335..4adb48e 100644
--- a/lib/nss_wrapper/wscript_build
+++ b/lib/nss_wrapper/wscript_build
@@ -3,6 +3,6 @@
bld.SAMBA_SUBSYSTEM('NSS_WRAPPER',
source='nss_wrapper.c',
- deps='dl replace'
+ deps='replace'
)
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 7276826..f9a2f45 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -307,9 +307,10 @@ def build(bld):
if bld.CONFIG_SET('REPLACE_STRPTIME'): REPLACE_HOSTCC_SOURCE += ' strptime.c'
if not bld.CONFIG_SET('HAVE_TIMEGM'): REPLACE_HOSTCC_SOURCE += ' timegm.c'
- bld.SAMBA_SUBSYSTEM('LIBREPLACE_H',
+ bld.SAMBA_SUBSYSTEM('LIBREPLACE_HOSTCC',
REPLACE_HOSTCC_SOURCE,
-
+ use_hostcc=True,
+ use_global_deps=False,
cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
group='compiler_libraries'
)
@@ -317,7 +318,7 @@ def build(bld):
REPLACE_SOURCE = REPLACE_HOSTCC_SOURCE
if bld.CONFIG_SET('REPLACE_GETPASS'): REPLACE_SOURCE += ' getpass.c'
-
+ if not bld.CONFIG_SET('HAVE_CRYPT'): REPLACE_SOURCE += ' crypt.c'
if not bld.CONFIG_SET('HAVE_DLOPEN'): REPLACE_SOURCE += ' dlfcn.c'
if not bld.CONFIG_SET('HAVE_SOCKETPAIR'): REPLACE_SOURCE += ' socketpair.c'
@@ -332,7 +333,7 @@ def build(bld):
bld.SAMBA_LIBRARY('replace',
source=REPLACE_SOURCE,
group='base_libraries',
- deps='nsl socket')
+ deps='crypt dl nsl socket')
TEST_SOURCES = '''test/testsuite.c test/main.c test/strptime.c
test/os2_delete.c test/getifaddrs.c'''
@@ -343,13 +344,6 @@ def build(bld):
deps='replace',
install=False)
- CRYPT_SOURCES = []
- if not 'HAVE_CRYPT' in bld.env: CRYPT_SOURCES.append('crypt.c')
-
- bld.SAMBA_SUBSYSTEM('LIBREPLACE_EXT',
- CRYPT_SOURCES,
- group='base_libraries')
-
# build replacements for stdint.h and stdbool.h if needed
bld.SAMBA_GENERATOR('replace_stdint_h',
rule='cp ${SRC} ${TGT}',
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 769fa50..90c527b 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,13 +10,13 @@ bld.SAMBA_SUBSYSTEM('LIBWINBIND-CLIENT',
bld.SAMBA_BINARY('nsstest',
source='nsstest.c',
installdir='BINDIR',
- deps='LIBSAMBA-UTIL LIBREPLACE_EXT LIBSAMBA-HOSTCONFIG NSS_WRAPPER'
+ deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG NSS_WRAPPER'
)
bld.SAMBA_BINARY('wbinfo',
source='wbinfo.c',
installdir='BINDIR',
- deps='LIBSAMBA-UTIL LIBREPLACE_EXT LIBCLI_AUTH popt POPT_SAMBA LIBWINBIND-CLIENT LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ UID_WRAPPER'
+ deps='LIBSAMBA-UTIL LIBCLI_AUTH popt POPT_SAMBA LIBWINBIND-CLIENT LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ UID_WRAPPER'
)
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 1ce42e8..03a812f 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -42,7 +42,7 @@ bld.SAMBA_MODULE('auth_unix',
source='auth_unix.c',
subsystem='auth',
init_function='auth_unix_init',
- deps='crypt pam PAM_ERRORS NSS_WRAPPER UID_WRAPPER LIBTSOCKET'
+ deps='pam PAM_ERRORS NSS_WRAPPER UID_WRAPPER LIBTSOCKET'
)
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index d40be0b..1bf1ff5 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -165,7 +165,7 @@ bld.SAMBA_ERRTABLE('HEIMDAL_HX509_ERR_ET',
bld.SAMBA_ERRTABLE('HEIMDAL_WIND_ERR_ET',
'../heimdal/lib/wind/wind_err.et')
-HEIMDAL_ROKEN_H_SOURCE = '''
+HEIMDAL_ROKEN_HOSTCC_SOURCE = '''
../heimdal/lib/roken/base64.c
../heimdal/lib/roken/ct.c
../heimdal/lib/roken/hex.c
@@ -200,15 +200,17 @@ HEIMDAL_ROKEN_H_SOURCE = '''
'''
if not bld.CONFIG_SET('HAVE_GETPROGNAME'):
- HEIMDAL_ROKEN_H_SOURCE += '''
+ HEIMDAL_ROKEN_HOSTCC_SOURCE += '''
../heimdal/lib/roken/getprogname.c
../heimdal/lib/roken/setprogname.c
'''
if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
- HEIMDAL_ROKEN_H_SOURCE += '../heimdal/lib/roken/closefrom.c'
+ HEIMDAL_ROKEN_HOSTCC_SOURCE += '''
+ ../heimdal/lib/roken/closefrom.c
+ '''
-HEIMDAL_ROKEN_SOURCE = HEIMDAL_ROKEN_H_SOURCE + '''
+HEIMDAL_ROKEN_SOURCE = HEIMDAL_ROKEN_HOSTCC_SOURCE + '''
../heimdal/lib/roken/resolve.c
../heimdal/lib/roken/socket.c
../heimdal/lib/roken/roken_gethostby.c
@@ -395,11 +397,14 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_WIND',
deps='HEIMDAL_ROKEN HEIMDAL_COM_ERR'
)
-bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_H',
- HEIMDAL_ROKEN_H_SOURCE,
+bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_HOSTCC',
+ HEIMDAL_ROKEN_HOSTCC_SOURCE,
+ use_hostcc=True,
+ use_global_deps=False,
includes='../heimdal/lib/roken',
cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
- group='compiler_libraries'
+ group='compiler_libraries',
+ deps='LIBREPLACE_HOSTCC'
)
@@ -415,10 +420,11 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_COM_ERR',
bld.SAMBA_BINARY('asn1_compile',
'../heimdal/lib/asn1/main.c ../heimdal/lib/asn1/gen.c ../heimdal/lib/asn1/gen_copy.c ../heimdal/lib/asn1/gen_decode.c ../heimdal/lib/asn1/gen_encode.c ../heimdal/lib/asn1/gen_free.c ../heimdal/lib/asn1/gen_glue.c ../heimdal/lib/asn1/gen_length.c ../heimdal/lib/asn1/gen_seq.c ../heimdal/lib/asn1/gen_template.c ../heimdal/lib/asn1/hash.c ../heimdal/lib/asn1/symbol.c ../heimdal/lib/asn1/asn1parse.c ../heimdal/lib/asn1/lex.c ../heimdal/lib/vers/print_version.c',
use_hostcc=True,
+ use_global_deps=False,
cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
includes='../heimdal/lib/asn1 ../heimdal/lib/roken',
group='build_compilers',
- deps='HEIMDAL_ROKEN_H LIBREPLACE_H',
+ deps='HEIMDAL_ROKEN_HOSTCC LIBREPLACE_HOSTCC',
install=False
)
@@ -426,10 +432,11 @@ bld.SAMBA_BINARY('asn1_compile',
bld.SAMBA_BINARY('compile_et',
'../heimdal/lib/vers/print_version.c ../heimdal/lib/com_err/parse.c ../heimdal/lib/com_err/lex.c ../heimdal/lib/com_err/compile_et.c',
use_hostcc=True,
+ use_global_deps=False,
includes='../heimdal/lib/com_err',
group='build_compilers',
cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
- deps='HEIMDAL_ROKEN_H LIBREPLACE_H',
+ deps='HEIMDAL_ROKEN_HOSTCC LIBREPLACE_HOSTCC',
install=False
)
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index f35d1c4..1308829 100644
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('LIBSAMBA-HOSTCONFIG',
source='loadparm.c generic.c util.c',
pc_files='samba-hostconfig.pc',
vnum='0.0.1',
- deps='DYNCONFIG LIBREPLACE_EXT CHARSET dl',
+ deps='DYNCONFIG CHARSET',
public_deps='LIBSAMBA-UTIL',
public_headers='param.h'
)
--
Samba Shared Repository
More information about the samba-cvs
mailing list