diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-20 16:27:48 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:47 +1000 |
| commit | 8f1b809d2ccb083cb84532e98b04a12fb1039e22 (patch) | |
| tree | e2e453049331e712e3312bc1c30e33c6ae683c54 /lib | |
| parent | 9cb39847c068305d544bcacd6887c57412e16586 (diff) | |
| download | samba-8f1b809d2ccb083cb84532e98b04a12fb1039e22.tar.gz samba-8f1b809d2ccb083cb84532e98b04a12fb1039e22.tar.bz2 samba-8f1b809d2ccb083cb84532e98b04a12fb1039e22.zip | |
build: nearly there on samba4 build
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/replace/wscript | 12 | ||||
| -rw-r--r-- | lib/socket_wrapper/wscript | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript index 0f3689a808..e3f7075897 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -26,16 +26,24 @@ def set_options(opt): opt.add_option('--enable-developer', help=("Turn on developer warnings and debugging"), action="store_true", dest='developer', default=False) + opt.add_option('--timestamp-dependencies', + help=("use file timestamps instead of content for build dependencies (BROKEN)"), + action="store", dest='timestamp_dependencies', default=False) @wafsamba.runonce def configure(conf): conf.env.hlist = [] conf.env.srcdir = conf.srcdir + if Options.options.timestamp_dependencies: + conf.ENABLE_TIMESTAMP_DEPENDENCIES() + # load our local waf extensions conf.check_tool('wafsamba', tooldir=conf.srcdir + "/buildtools/wafsamba") conf.check_tool('compiler_cc') + # gccdeps can be useful for debugging recursion in #include lines + # conf.check_tool('gccdeps', tooldir=conf.srcdir + "/buildtools/wafsamba") # make the install paths available in environment conf.env.LIBDIR = Options.options.LIBDIR @@ -191,7 +199,7 @@ def configure(conf): msg="Checking for C99 vsnprintf") if Options.options.developer: - conf.ADD_CFLAGS('-Wall -g -Wfatal-errors -DDEVELOPER -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k') + conf.ADD_CFLAGS('-Wall -g -Wfatal-errors -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k') conf.SAMBA_CONFIG_H() conf.SAMBA_BUILD_ENV() @@ -302,7 +310,7 @@ def build(bld): if bld.CONFIG_SET('HAVE_INET_PTON'): NET_SOURCES.append('inet_pton.c') if bld.CONFIG_SET('HAVE_SOCKETPAIR'): NET_SOURCES.append('socketpair.c') - bld.SAMBA_SUBSYSTEM('LIBREPLACE_NETWORK', NET_SOURCES) + bld.SAMBA_SUBSYSTEM('LIBREPLACE_NETWORK', NET_SOURCES, deps='replace') CRYPT_SOURCES = [] diff --git a/lib/socket_wrapper/wscript b/lib/socket_wrapper/wscript index 0534fbcda4..edd7af69f4 100644 --- a/lib/socket_wrapper/wscript +++ b/lib/socket_wrapper/wscript @@ -8,4 +8,5 @@ def set_options(opt): def configure(conf): if Options.options.enable_socket_wrapper or Options.options.developer: conf.DEFINE('SOCKET_WRAPPER', 1) + conf.ADD_GLOBAL_DEPENDENCY('SOCKET_WRAPPER') |