diff options
author | Sven Eden <sven.eden@prydeworx.com> | 2018-11-08 07:53:08 +0100 |
---|---|---|
committer | Sven Eden <sven.eden@prydeworx.com> | 2018-11-08 08:02:57 +0100 |
commit | 2f5ca87f222ec5ae62e5c2f17b53046905ecfbca (patch) | |
tree | 39d643ce267855d891776eca8a05544cab56da50 | |
parent | b3ced55dae5e496d5e8741ca5e4fb5a4ba62a9a3 (diff) |
Prep v239.2: Fix migration errors in libelogind
-rw-r--r-- | src/libelogind/disable-mempool.c | 2 | ||||
-rw-r--r-- | src/libelogind/meson.build | 38 | ||||
-rw-r--r-- | src/libelogind/sd-bus/bus-error.c | 2 | ||||
-rw-r--r-- | src/libelogind/sd-bus/bus-error.h | 2 |
4 files changed, 22 insertions, 22 deletions
diff --git a/src/libelogind/disable-mempool.c b/src/libelogind/disable-mempool.c index c86e55340..034bd24dc 100644 --- a/src/libelogind/disable-mempool.c +++ b/src/libelogind/disable-mempool.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ -//#include "mempool.h" +#include "mempool.h" const bool mempool_use_allowed = false; diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index 2e5e8706a..98e19f9e9 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -81,13 +81,6 @@ sd_login_c = files('sd-login/sd-login.c') # sd-utf8/sd-utf8.c # '''.split()) + id128_sources + sd_daemon_c + sd_event_c + sd_login_c # -# disable_mempool_c = files('disable-mempool.c') -# -# libsystemd_c_args = ['-fvisibility=default'] -# -# libsystemd_static = static_library( -# 'systemd_static', -# libsystemd_sources, #else libelogind_sources = files(''' sd-bus/bus-common-errors.c @@ -127,29 +120,32 @@ libelogind_sources = files(''' sd-bus/bus-type.c sd-bus/bus-type.h sd-bus/sd-bus.c - sd-daemon/sd-daemon.c - sd-event/sd-event.c - sd-id128/id128-util.c - sd-id128/id128-util.h - sd-id128/sd-id128.c -'''.split()) + sd_login_c +'''.split()) + id128_sources + sd_daemon_c + sd_event_c + sd_login_c #endif // 0 + +disable_mempool_c = files('disable-mempool.c') + +libelogind_c_args = ['-fvisibility=default'] + +libelogind_static = static_library( + 'elogind_static', + libelogind_sources, install : false, include_directories : includes, link_with : libbasic, #if 0 /// elogind does not need librt # dependencies : [threads, # librt], -# c_args : libsystemd_c_args) -# -# libsystemd_sym = 'src/libsystemd/libsystemd.sym' -# -# libsystemd_pc = configure_file( -# input : 'libsystemd.pc.in', -# output : 'libsystemd.pc', -# install_data(libsystemd_pc, #else dependencies : [threads], #endif // 0 + c_args : libelogind_c_args) + +libelogind_sym = 'src/libelogind/libelogind.sym' + +libelogind_pc = configure_file( + input : 'libelogind.pc.in', + output : 'libelogind.pc', configuration : substs) +install_data(libelogind_pc, install_dir : pkgconfiglibdir) diff --git a/src/libelogind/sd-bus/bus-error.c b/src/libelogind/sd-bus/bus-error.c index f0673225c..c9745313c 100644 --- a/src/libelogind/sd-bus/bus-error.c +++ b/src/libelogind/sd-bus/bus-error.c @@ -310,6 +310,7 @@ finish: return -bus_error_name_to_errno(e->name); } +#if 0 /// UNNEEDED by elogind int sd_bus_error_move(sd_bus_error *dest, sd_bus_error *e) { int r; @@ -331,6 +332,7 @@ int sd_bus_error_move(sd_bus_error *dest, sd_bus_error *e) { return r; } +#endif // 0 _public_ int sd_bus_error_set_const(sd_bus_error *e, const char *name, const char *message) { if (!name) diff --git a/src/libelogind/sd-bus/bus-error.h b/src/libelogind/sd-bus/bus-error.h index 45146fe81..9c6f65362 100644 --- a/src/libelogind/sd-bus/bus-error.h +++ b/src/libelogind/sd-bus/bus-error.h @@ -48,4 +48,6 @@ int bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_lis BUS_ERROR_MAP_ELF_USE(bus_standard_errors); +#if 0 /// UNNEEDED by elogind int sd_bus_error_move(sd_bus_error *dest, sd_bus_error *e); +#endif // 0 |