From 9b1d27b606bf5349229a2ff4bdf5d141055dcdea Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 27 Mar 2019 23:53:50 +0300 Subject: [PATCH] Force libsystemd For some reason waf failed to switch to libsystemd after not finding libsystemd-daemon, which was depreceated long time ago --- lib/util/wscript_build | 4 ++-- lib/util/wscript_configure | 24 +++--------------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/lib/util/wscript_build b/lib/util/wscript_build index c6188ede58d..1e12ce50446 100644 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -50,7 +50,7 @@ if bld.CONFIG_SET('HAVE_GPFS'): bld.SAMBA_LIBRARY('samba-debug', source='debug.c', deps='replace time-basic close-low-fd talloc socket-blocking' + samba_debug_add_deps, - public_deps='systemd systemd-journal lttng-ust', + public_deps='systemd lttng-ust', local_include=False, includes=samba_debug_add_inc, private_library=True) @@ -75,7 +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 tini''', - public_deps='systemd systemd-daemon sys_rw', + public_deps='systemd sys_rw', local_include=False) bld.SAMBA_LIBRARY('iov_buf', diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure index b06f1c14074..5a112102e3f 100644 --- a/lib/util/wscript_configure +++ b/lib/util/wscript_configure @@ -99,29 +99,11 @@ conf.CHECK_CODE('struct statvfs buf; buf.f_flags = 0', local_include=False, execute=False) -# -# systemd removed the libsystemd-daemon and libsystemd-journal libraries. In newer -# versions it is only libsystemd. As waf pkg-config handling does not provide -# targets which could be used as a dependency based on the package name we need -# to look for them on our own. This enabled one of the library targets based on -# which version we detect. -# -conf.SET_TARGET_TYPE('systemd-daemon', 'EMPTY') -conf.SET_TARGET_TYPE('systemd-journal', 'EMPTY') conf.SET_TARGET_TYPE('systemd', 'EMPTY') - if Options.options.enable_systemd != False: - r_daemon = conf.CHECK_CFG(package='libsystemd-daemon', args='--cflags --libs', - msg='Checking for libsystemd-daemon') - r_journal = conf.CHECK_CFG(package='libsystemd-journal', args='--cflags --libs', - msg='Checking for libsystemd-journal') - if r_daemon is None and r_journal is None: - conf.CHECK_CFG(package='libsystemd', args='--cflags --libs', - msg='Checking for libsystemd') - conf.CHECK_LIB('systemd', shlib=True) - else: - conf.CHECK_LIB('systemd-daemon', shlib=True) - conf.CHECK_LIB('systemd-journal', shlib=True) + conf.CHECK_CFG(package='libsystemd', args='--cflags --libs', + msg='Checking for libsystemd') + conf.CHECK_LIB('systemd', shlib=True) conf.SET_TARGET_TYPE('lttng-ust', 'EMPTY') -- 2.20.1