From c59d5e11967b9b0afb16fcffc023c1437bf9ad21 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 5 Mar 2018 15:08:55 +0100 Subject: [PATCH] build: fix standalone ctdb build --with-systemd For standalone ctdb builds, a samba-util-core dependency is added, without corresponding systemd libraries, which are needed when become_daemon.c is built --with-systemd. This results in: default/lib/util/become_daemon_20.o: In function `daemon_status': become_daemon.c:(.text+0x456): undefined reference to `sd_notifyf' collect2: error: ld returned 1 exit status Fix this by moving the systemd library dependencies from samba-util to samba-util-core, the become_daemon.c base build target. Signed-off-by: David Disseldorp Reviewed-by: Andreas Schneider Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Mon Mar 5 20:49:51 CET 2018 on sn-devel-144 --- lib/util/wscript_build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 615ff75aa70..deed2b0b57d 100644 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -75,6 +75,7 @@ bld.SAMBA_SUBSYSTEM('samba-util-core', become_daemon.c mkdir_p.c''', deps='''time-basic samba-debug socket-blocking talloc tevent execinfo pthread strv''', + public_deps='systemd systemd-daemon', local_include=False) bld.SAMBA_LIBRARY('iov_buf', @@ -124,7 +125,7 @@ else: server_id.c dprintf.c tevent_debug.c memcache.c unix_match.c tfork.c''', deps='samba-util-core DYNCONFIG close-low-fd tini tiniparser genrand util_str_hex', - public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid systemd systemd-daemon', + public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid', public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h string_wrappers.h idtree.h idtree_random.h blocking.h signal.h substitute.h fault.h genrand.h tfork.h', header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ], local_include=False, -- 2.11.4.GIT