From: Zbigniew Jędrzejewski-Szmek Date: Tue, 19 Dec 2017 10:35:01 +0000 (+0100) Subject: meson: rename libsystemd_internal to libsystem_static X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5e7c94d0ff790aee82d5cbf934a6a440aeca6f42;p=elogind.git meson: rename libsystemd_internal to libsystem_static We already use the "_static" suffix for libshared_static ("shared" is the name of the library, "static" is the format) and other libs, so let's rename for consistency. Also change libsystemd_static_sources to libsystemd_sources, since the same list is used for both and shorter is better. --- diff --git a/meson.build b/meson.build index d4c90b803..5c3fe9209 100644 --- a/meson.build +++ b/meson.build @@ -486,7 +486,7 @@ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'], ['IFLA_VRF_TABLE', 'linux/if_link.h'], ['IFLA_MACVLAN_FLAGS', 'linux/if_link.h'], - ['IFLA_IPVLAN_FLAGS', 'linux/if_link.h'], + ['IFLA_IPVLAN_MODE', 'linux/if_link.h'], ['IFLA_PHYS_PORT_ID', 'linux/if_link.h'], ['IFLA_BOND_AD_INFO', 'linux/if_link.h'], ['IFLA_VLAN_PROTOCOL', 'linux/if_link.h'], @@ -501,7 +501,6 @@ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], ['IFLA_BRPORT_PROXYARP', 'linux/if_link.h'], ['IFLA_BRPORT_LEARNING_SYNC', 'linux/if_link.h'], ['IFLA_BR_VLAN_DEFAULT_PVID', 'linux/if_link.h'], - ['IPVLAN_F_PRIVATE', 'linux/if_link.h'], ['NDA_IFINDEX', 'linux/neighbour.h'], ['IFA_FLAGS', 'linux/if_addr.h'], ['FRA_UID_RANGE', 'linux/fib_rules.h'], @@ -518,17 +517,17 @@ foreach ident : ['secure_getenv', '__secure_getenv'] endforeach foreach ident : [ - ['memfd_create', '''#include '''], - ['gettid', '''#include -// #include '''], - ['pivot_root', '''#include - #include '''], # no known header declares pivot_root - ['name_to_handle_at', '''#include + ['memfd_create', '''#define _GNU_SOURCE +// #include '''], + ['gettid', '''#include '''], + ['pivot_root', '''#include '''], # no known header declares pivot_root + ['name_to_handle_at', '''#define _GNU_SOURCE +// #include #include #include '''], - ['setns', '''#include '''], - ['renameat2', '''#include -// #include '''], + ['setns', '''#define _GNU_SOURCE +// #include '''], + ['renameat2', '''#include '''], ['kcmp', '''#include '''], ['keyctl', '''#include #include '''], @@ -539,11 +538,11 @@ foreach ident : [ ['explicit_bzero' , '''#include '''], ] - have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') + have = cc.has_function(ident[0], prefix : ident[1]) conf.set10('HAVE_' + ident[0].to_upper(), have) endforeach -if cc.has_function('getrandom', prefix : '''#include ''', args : '-D_GNU_SOURCE') +if cc.has_function('getrandom', prefix : '''#include ''') conf.set10('USE_SYS_RANDOM_H', true) conf.set10('HAVE_GETRANDOM', true) else @@ -1442,7 +1441,7 @@ subdir('src/login') # libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym) # libsystemd = shared_library( # 'systemd', -# libsystemd_internal_sources, +# libsystemd_sources, # journal_internal_sources, # version : libsystemd_version, # include_directories : includes, @@ -1547,7 +1546,7 @@ test_dlopen = executable( # '-shared', # '-Wl,--version-script=' + version_script_arg, # '-Wl,--undefined'], -# link_with : [libsystemd_internal, +# link_with : [libsystemd_static, # libbasic], # dependencies : [threads, # librt], @@ -1787,7 +1786,7 @@ test_dlopen = executable( # include_directories : includes, # link_args : ['-shared', # '-Wl,--version-script=' + version_script_arg], -# link_with : [libsystemd_internal, +# link_with : [libsystemd_static, # libshared_static], # dependencies : [threads, # libpam, @@ -2800,8 +2799,6 @@ install_data('README', #endif // 0 'LICENSE.GPL2', 'LICENSE.LGPL2.1', - 'TRANSIENT-SETTINGS.md', - 'UIDS-GIDS.md', 'src/libelogind/sd-bus/GVARIANT-SERIALIZATION', install_dir : docdir) diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build index d4306bba0..583f4d73f 100644 --- a/src/libelogind/meson.build +++ b/src/libelogind/meson.build @@ -18,7 +18,7 @@ sd_login_c = files('sd-login/sd-login.c') #if 0 /// elogind has a shorter list, of course... -# libsystemd_internal_sources = files(''' +# libsystemd_sources = files(''' # sd-bus/bus-bloom.c # sd-bus/bus-bloom.h # sd-bus/bus-common-errors.c @@ -142,9 +142,9 @@ libelogind_internal_sources = files(''' '''.split()) + sd_login_c #endif // 0 -libelogind_internal = static_library( +libelogind_static = static_library( 'elogind', - libelogind_internal_sources, + libelogind_sources, install : false, include_directories : includes, link_with : libbasic, diff --git a/src/shared/meson.build b/src/shared/meson.build index d96fca747..9270648dd 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -199,7 +199,7 @@ libshared = shared_library( basic_sources, #if 0 /// UNNEEDED by elogind # journal_internal_sources, -# libsystemd_internal_sources, +# libsystemd_sources, # libudev_sources, #else libelogind_internal_sources, diff --git a/src/test/meson.build b/src/test/meson.build index fab9c4215..2d88a8716 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -40,8 +40,8 @@ generate_sym_test_py = find_program('generate-sym-test.py') test_libelogind_sym_c = custom_target( 'test-libelogind-sym.c', - output : 'test-libelogind-sym.c', input : [libelogind_sym_path] + systemd_headers, + output : 'test-libelogind-sym.c', command : [generate_sym_test_py, libelogind_sym_path] + systemd_headers, capture : true) @@ -59,8 +59,8 @@ test_dlopen_c = files('test-dlopen.c') ############################################################ #if 0 /// UNNEEDED by elogind -# test_elogind_tmpfiles_py = find_program('test-elogind-tmpfiles.py') #endif // 0 +test_elogind_tmpfiles_py = find_program('test-elogind-tmpfiles.py') ############################################################ @@ -74,7 +74,7 @@ tests += [ # 'src/test/test-helper.c'], # [libcore, # libudev, -# libelogind_internal], +# libsystemd_static], # [threads, # librt, # libseccomp, @@ -832,7 +832,7 @@ tests += [ [['src/libelogind/sd-bus/test-bus-error.c'], [libshared_static, - libelogind_internal], + libelogind_static], []], #if 0 /// UNNEEDED in elogind @@ -919,22 +919,22 @@ tests += [ #if 0 /// UNNEEDED in elogind # tests += [ -# [['src/libelogind-network/test-dhcp-option.c', -# 'src/libelogind-network/dhcp-protocol.h', -# 'src/libelogind-network/dhcp-internal.h'], +# [['src/libsystemd-network/test-dhcp-option.c', +# 'src/libsystemd-network/dhcp-protocol.h', +# 'src/libsystemd-network/dhcp-internal.h'], # [libshared, # libelogind_network], # []], # -# [['src/libelogind-network/test-sd-dhcp-lease.c', -# 'src/libelogind-network/dhcp-lease-internal.h'], +# [['src/libsystemd-network/test-sd-dhcp-lease.c', +# 'src/libsystemd-network/dhcp-lease-internal.h'], # [libshared, # libelogind_network], # []], # -# [['src/libelogind-network/test-dhcp-client.c', -# 'src/libelogind-network/dhcp-protocol.h', -# 'src/libelogind-network/dhcp-internal.h', +# [['src/libsystemd-network/test-dhcp-client.c', +# 'src/libsystemd-network/dhcp-protocol.h', +# 'src/libsystemd-network/dhcp-internal.h', # 'src/systemd/sd-dhcp-client.h'], # [libshared, # libelogind_network], @@ -945,8 +945,8 @@ tests += [ # libelogind_network], # []], # -# [['src/libelogind-network/test-ipv4ll.c', -# 'src/libelogind-network/arp-util.h', +# [['src/libsystemd-network/test-ipv4ll.c', +# 'src/libsystemd-network/arp-util.h', # 'src/systemd/sd-ipv4ll.h'], # [libshared, # libelogind_network], @@ -966,27 +966,27 @@ tests += [ # [], # '', 'manual'], # -# [['src/libelogind-network/test-ndisc-rs.c', -# 'src/libelogind-network/dhcp-identifier.h', -# 'src/libelogind-network/dhcp-identifier.c', -# 'src/libelogind-network/icmp6-util.h', +# [['src/libsystemd-network/test-ndisc-rs.c', +# 'src/libsystemd-network/dhcp-identifier.h', +# 'src/libsystemd-network/dhcp-identifier.c', +# 'src/libsystemd-network/icmp6-util.h', # 'src/systemd/sd-dhcp6-client.h', # 'src/systemd/sd-ndisc.h'], # [libshared, # libelogind_network], # []], # -# [['src/libelogind-network/test-ndisc-ra.c', -# 'src/libelogind-network/icmp6-util.h', +# [['src/libsystemd-network/test-ndisc-ra.c', +# 'src/libsystemd-network/icmp6-util.h', # 'src/systemd/sd-ndisc.h'], # [libshared, # libelogind_network], # []], # -# [['src/libelogind-network/test-dhcp6-client.c', -# 'src/libelogind-network/dhcp-identifier.h', -# 'src/libelogind-network/dhcp-identifier.c', -# 'src/libelogind-network/dhcp6-internal.h', +# [['src/libsystemd-network/test-dhcp6-client.c', +# 'src/libsystemd-network/dhcp-identifier.h', +# 'src/libsystemd-network/dhcp-identifier.c', +# 'src/libsystemd-network/dhcp6-internal.h', # 'src/systemd/sd-dhcp6-client.h'], # [libshared, # libelogind_network],