[PATCH] some dependency cleanup
Volker Lendecke
Volker.Lendecke at SerNet.DE
Tue Sep 16 15:15:28 MDT 2014
Hi!
Review&push would be appreciated.
Thanks,
Volker
--
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 3c349330592657d7fd15064be0a63908dd84cea7 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 16 Sep 2014 22:39:01 +0200
Subject: [PATCH 1/2] lib: Make set_blocking() available independently
async_connect_send() needs this, and I don't want to pull in samba-util
just for this
Signed-off-by: Volker Lendecke <vl at samba.org>
---
lib/async_req/wscript_build | 2 +-
lib/util/wscript_build | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/async_req/wscript_build b/lib/async_req/wscript_build
index 0de58e4..7802935 100644
--- a/lib/async_req/wscript_build
+++ b/lib/async_req/wscript_build
@@ -4,6 +4,6 @@
bld.SAMBA_SUBSYSTEM('LIBASYNC_REQ',
source='async_sock.c',
public_deps='talloc tevent',
- deps='tevent-util'
+ deps='tevent-util socket-blocking'
)
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index cff7337..f453f8f 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -45,16 +45,20 @@ bld.SAMBA_SUBSYSTEM('util_dir',
deps='samba-debug',
local_include=False)
+bld.SAMBA_SUBSYSTEM('socket-blocking',
+ source='blocking.c',
+ local_include=False)
+
bld.SAMBA_LIBRARY('samba-util',
source='''talloc_stack.c smb_threads.c xfile.c data_blob.c
util_file.c time.c rbtree.c rfc1738.c select.c getpass.c
- genrand.c fsusage.c blocking.c become_daemon.c
+ genrand.c fsusage.c become_daemon.c
signal.c system.c params.c util.c util_id.c util_net.c
util_strlist.c util_paths.c idtree.c fault.c base64.c
util_str.c util_str_common.c substitute.c ms_fnmatch.c
dprintf.c parmlist.c bitmap.c pidfile.c
tevent_debug.c util_process.c memcache.c''',
- deps='DYNCONFIG time-basic close-low-fd samba-debug tini tiniparser server_id util_dir',
+ deps='DYNCONFIG time-basic close-low-fd samba-debug tini tiniparser server_id util_dir socket-blocking',
public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid systemd-daemon',
public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h server_id.h util_dir.h',
header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
--
1.7.9.5
From a959dd9d2d7fbbe57ca12546f7df36b2936cffff Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 16 Sep 2014 23:11:27 +0200
Subject: [PATCH 2/2] lib: Reduce deps for "smb_transport"
Signed-off-by: Volker Lendecke <vl at samba.org>
---
libcli/smb/wscript | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libcli/smb/wscript b/libcli/smb/wscript
index 17efc97..e6556ce 100755
--- a/libcli/smb/wscript
+++ b/libcli/smb/wscript
@@ -6,8 +6,8 @@ def build(bld):
source='''
read_smb.c
''',
- deps='errors LIBASYNC_REQ',
- public_deps='talloc tevent samba-util',
+ deps='LIBASYNC_REQ',
+ public_deps='talloc tevent',
private_library=True,
public_headers='''
read_smb.h
--
1.7.9.5
More information about the samba-technical
mailing list