From d76f800a0e63a9cd865de60fb026e2d23a9c54f4 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Thu, 26 Feb 2015 11:09:09 +1100 Subject: [PATCH] lib/util: Build iov_buf library only when building samba lib/util can be built with SAMBA_UTIL_CORE_ONLY for building standalone ctdb. Any new libraries if not required by ctdb should be built only when SAMBA_UTIL_CORE_ONLY is not specified. Signed-off-by: Amitay Isaacs Reviewed-by: Michael Adam Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Fri Feb 27 09:06:01 CET 2015 on sn-devel-104 --- lib/util/wscript_build | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 25887424857..b1cdfd59330 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Please add any new SAMBA_SUBSYSTEM/SAMBA_LIBRARY to the bottom of the file +# unless they are also required to build standalone ctdb. + bld.SAMBA_SUBSYSTEM('time-basic', source='time_basic.c', deps='replace', @@ -36,11 +39,6 @@ bld.SAMBA_LIBRARY('socket-blocking', local_include=False, private_library=True) -bld.SAMBA_LIBRARY('iov_buf', - source='iov_buf.c', - local_include=False, - private_library=True) - bld.SAMBA_SUBSYSTEM('samba-util-core', source='''xfile.c data_blob.c util_file.c time.c signal.c util.c idtree.c fault.c @@ -156,3 +154,8 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY: deps='talloc tdb strv util_tdb tdb-wrap samba-util', local_include=False, private_library=True) + + bld.SAMBA_LIBRARY('iov_buf', + source='iov_buf.c', + local_include=False, + private_library=True) -- 2.11.4.GIT