SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: update linking for fixed meson linking

Browse Source 
With mesonbuid/meson#1545, meson does not propagate deps of a library
when linking with that library. That's of course the right thing to do,
but it exposes a bunch of missing deps.

This compiles with both meson-0.39.1 and meson-git + pr/1545.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-04-23 21:47:27 -04:00
parent e0bec52f27
commit 826472ce36
9 changed files with 329 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/meson.build
-88
View File
@@ -96,91 +96,3 @@ libsystemd_pc = configure_file(
configuration : substs)
install_data(libsystemd_pc,
install_dir : pkgconfiglibdir)
tests += [
[['src/libsystemd/sd-bus/test-bus-marshal.c'],
[],
[libglib,
libgobject,
libgio,
libdbus]],
[['src/libsystemd/sd-bus/test-bus-signature.c'],
[],
[]],
[['src/libsystemd/sd-bus/test-bus-chat.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-cleanup.c'],
[],
[libseccomp]],
[['src/libsystemd/sd-bus/test-bus-track.c'],
[],
[libseccomp]],
[['src/libsystemd/sd-bus/test-bus-server.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-objects.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-gvariant.c'],
[],
[libglib,
libgobject,
libgio]],
[['src/libsystemd/sd-bus/test-bus-creds.c'],
[],
[]],
[['src/libsystemd/sd-bus/test-bus-match.c'],
[],
[]],
[['src/libsystemd/sd-bus/test-bus-kernel.c'],
[],
[]],
[['src/libsystemd/sd-bus/test-bus-kernel-bloom.c'],
[],
[]],
[['src/libsystemd/sd-bus/test-bus-benchmark.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-zero-copy.c'],
[],
[]],
[['src/libsystemd/sd-bus/test-bus-introspect.c'],
[],
[]],
[['src/libsystemd/sd-event/test-event.c'],
[],
[]],
[['src/libsystemd/sd-netlink/test-netlink.c'],
[],
[]],
[['src/libsystemd/sd-netlink/test-local-addresses.c'],
[],
[]],
[['src/libsystemd/sd-resolve/test-resolve.c'],
[],
[threads]],
[['src/libsystemd/sd-login/test-login.c'],
[],
[],
'', 'manual'],
]
src/libudev/meson.build
+2 -1
View File
@@ -26,7 +26,8 @@ libudev = shared_library(
link_args : ['-shared',
'-Wl,--version-script=' + libudev_sym_path],
link_with : [libbasic,
libsystemd],
libsystemd_internal],
dependencies : [threads],
link_depends : libudev_sym,
install : true,
install_dir : rootlibdir)
src/machine/meson.build
+4 -2
View File
@@ -41,7 +41,9 @@ endif
tests += [
[['src/machine/test-machine-tables.c'],
[libmachine_core,
libshared],
[],
libshared_static,
libsystemd_internal,
libudev],
[threads],
'ENABLE_MACHINED'],
]
src/network/meson.build
+4 -1
View File
@@ -115,13 +115,15 @@ endif
tests += [
[['src/network/test-networkd-conf.c'],
[libnetworkd_core,
libsystemd_network],
libsystemd_network,
libudev],
[]],
[['src/network/test-network.c'],
[libnetworkd_core,
libudev_internal,
libsystemd_network,
libsystemd_internal,
libfirewall],
[libiptc]],
@@ -132,6 +134,7 @@ tests += [
libudev_internal,
libudev_core,
libsystemd_network,
libsystemd_internal,
libfirewall],
[],
'', '', [],
src/resolve/meson.build
+2 -1
View File
@@ -173,7 +173,8 @@ tests += [
[['src/resolve/test-dnssec-complex.c',
'src/resolve/dns-type.c',
dns_type_headers],
[libshared],
[libshared,
libsystemd_internal],
[],
'ENABLE_RESOLVED', 'manual'],
]
src/shared/meson.build
+1 -1
View File
@@ -126,7 +126,7 @@ libshared = shared_library(
link_args : ['-shared'],
c_args : ['-fvisibility=default'],
link_with : [libsystemd_journal_internal,
libsystemd,
libsystemd_internal,
libudev,
],
dependencies : [threads,
src/test/meson.build
+189 -47
View File
@@ -45,7 +45,7 @@ tests += [
[['src/test/test-engine.c'],
[libcore,
libudev,
libsystemd],
libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -56,7 +56,7 @@ tests += [
[['src/test/test-job-type.c'],
[libcore,
libudev,
libsystemd],
libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -67,7 +67,7 @@ tests += [
[['src/test/test-ns.c'],
[libcore,
libudev,
libsystemd],
libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -79,7 +79,7 @@ tests += [
[['src/test/test-loopback.c'],
[libcore,
libudev,
libsystemd],
libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -90,7 +90,7 @@ tests += [
[['src/test/test-hostname.c'],
[libcore,
libudev,
libsystemd],
libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -112,7 +112,7 @@ tests += [
[['src/test/test-unit-name.c'],
[libcore,
libudev,
libsystemd],
libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -123,7 +123,7 @@ tests += [
[['src/test/test-unit-file.c'],
[libcore,
libudev,
libsystemd],
libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -156,7 +156,8 @@ tests += [
[]],
[['src/test/test-condition.c'],
[libshared],
[libsystemd_internal,
libshared],
[]],
[['src/test/test-fdset.c'],
@@ -287,8 +288,9 @@ tests += [
[['src/test/test-namespace.c'],
[libcore,
libudev,
libsystemd],
[libblkid]],
libsystemd_internal],
[threads,
libblkid]],
[['src/test/test-verbs.c'],
[libshared],
@@ -368,7 +370,8 @@ tests += [
libjournal_core,
libudev_core,
libudev_internal,
libsystemd_network],
libsystemd_network,
libsystemd_internal],
[threads,
libseccomp,
libmount,
@@ -418,7 +421,8 @@ tests += [
'HAVE_LIBIPTC'],
[['src/test/test-netlink-manual.c'],
[libshared],
[libshared,
libsystemd_internal],
[libkmod],
'', 'manual'],
@@ -459,7 +463,7 @@ tests += [
[['src/test/test-cgroup-mask.c'],
[libcore,
libudev,
libsystemd],
libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -490,7 +494,7 @@ tests += [
[['src/test/test-path.c'],
[libcore,
libudev,
libsystemd],
libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -501,7 +505,7 @@ tests += [
[['src/test/test-execute.c'],
[libcore,
libudev,
libsystemd],
libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -519,7 +523,7 @@ tests += [
[['src/test/test-install.c'],
[libcore,
libsystemd],
libsystemd_internal],
[],
'', 'manual'],
@@ -530,7 +534,7 @@ tests += [
[['src/test/test-sched-prio.c'],
[libcore,
libudev,
libsystemd],
libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -561,13 +565,15 @@ tests += [
[]],
[['src/test/test-libudev.c'],
[libshared],
[libshared,
libudev],
[]],
[['src/test/test-udev.c'],
[libudev_core,
libudev_internal,
libsystemd_network,
libsystemd_internal,
libshared],
[librt,
libblkid,
@@ -576,7 +582,8 @@ tests += [
'', 'manual'],
[['src/test/test-id128.c'],
[libshared],
[libshared,
libsystemd_internal],
[]],
[['src/test/test-hash.c'],
@@ -584,7 +591,8 @@ tests += [
[]],
[['src/test/test-nss.c'],
[libshared],
[libshared,
libsystemd_internal],
[libdl],
'', 'manual'],
]
@@ -595,7 +603,8 @@ tests += [
tests += [
[['src/journal/test-journal.c'],
[libjournal_core],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
@@ -603,87 +612,215 @@ tests += [
[['src/journal/test-journal-send.c'],
[libjournal_core,
libshared],
[]],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-syslog.c'],
[libjournal_core,
libshared,
libudev],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-match.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-match.c'],
[libshared],
[['src/journal/test-journal-enum.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-enum.c'],
[libshared],
[]],
[['src/journal/test-journal-stream.c'],
[libshared],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-flush.c'],
[libshared],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-init.c'],
[libshared],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-verify.c'],
[libshared],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-interleaving.c'],
[libshared],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-mmap-cache.c'],
[libshared],
[]],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-catalog.c'],
[libshared],
[],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4],
'', '', '-DCATALOG_DIR="@0@"'.format(build_catalog_dir)],
[['src/journal/test-compress.c'],
[libshared],
[libjournal_core,
libshared],
[liblz4,
libxz]],
[['src/journal/test-compress-benchmark.c'],
[libshared],
[libjournal_core,
libshared],
[liblz4,
libxz]],
[['src/journal/test-audit-type.c'],
[libshared],
[]],
[libjournal_core,
libshared],
[liblz4,
libxz]],
]
############################################################
tests += [
[['src/libsystemd/sd-bus/test-bus-marshal.c'],
[libsystemd_internal,
libshared],
[threads,
libglib,
libgobject,
libgio,
libdbus]],
[['src/libsystemd/sd-bus/test-bus-signature.c'],
[libshared_static,
libsystemd_internal],
[threads]],
[['src/libsystemd/sd-bus/test-bus-chat.c'],
[libshared_static,
libsystemd_internal],
[threads]],
[['src/libsystemd/sd-bus/test-bus-cleanup.c'],
[libshared_static,
libsystemd_internal],
[threads,
libseccomp]],
[['src/libsystemd/sd-bus/test-bus-error.c'],
[libshared_static,
libsystemd],
libsystemd_internal],
[]],
]
[['src/libsystemd/sd-bus/test-bus-track.c'],
[],
[libseccomp]],
[['src/libsystemd/sd-bus/test-bus-server.c'],
[libshared_static,
libsystemd_internal],
[threads]],
[['src/libsystemd/sd-bus/test-bus-objects.c'],
[libshared_static,
libsystemd_internal],
[threads]],
[['src/libsystemd/sd-bus/test-bus-gvariant.c'],
[libshared,
libsystemd_internal],
[libglib,
libgobject,
libgio]],
[['src/libsystemd/sd-bus/test-bus-creds.c'],
[libshared,
libsystemd_internal],
[]],
[['src/libsystemd/sd-bus/test-bus-match.c'],
[libshared,
libsystemd_internal],
[]],
[['src/libsystemd/sd-bus/test-bus-kernel.c'],
[libshared,
libsystemd_internal],
[]],
[['src/libsystemd/sd-bus/test-bus-kernel-bloom.c'],
[libshared,
libsystemd_internal],
[]],
[['src/libsystemd/sd-bus/test-bus-benchmark.c'],
[libshared,
libsystemd_internal],
[threads]],
[['src/libsystemd/sd-bus/test-bus-zero-copy.c'],
[libshared,
libsystemd_internal],
[]],
[['src/libsystemd/sd-bus/test-bus-introspect.c'],
[libshared,
libsystemd_internal],
[]],
[['src/libsystemd/sd-event/test-event.c'],
[],
[]],
[['src/libsystemd/sd-netlink/test-netlink.c'],
[libshared,
libsystemd_internal],
[]],
[['src/libsystemd/sd-netlink/test-local-addresses.c'],
[libshared,
libsystemd_internal],
[]],
[['src/libsystemd/sd-resolve/test-resolve.c'],
[libshared,
libsystemd_internal],
[threads]],
[['src/libsystemd/sd-login/test-login.c'],
[libshared,
libsystemd],
[],
'', 'manual'],
]
############################################################
@@ -700,7 +837,8 @@ tests += [
'src/libsystemd-network/dhcp-internal.h',
'src/systemd/sd-dhcp-client.h'],
[libshared,
libsystemd_network],
libsystemd_network,
libudev],
[]],
[['src/libsystemd-network/test-dhcp-server.c'],
@@ -718,14 +856,16 @@ tests += [
[['src/libsystemd-network/test-ipv4ll-manual.c',
'src/systemd/sd-ipv4ll.h'],
[libshared,
libsystemd_network],
libsystemd_network,
libsystemd_internal],
[],
'', 'manual'],
[['src/libsystemd-network/test-acd.c',
'src/systemd/sd-ipv4acd.h'],
[libshared,
libsystemd_network],
libsystemd_network,
libsystemd_internal],
[],
'', 'manual'],
@@ -770,6 +910,8 @@ tests += [
[['src/login/test-login-tables.c'],
[liblogind_core,
libsystemd_internal,
libudev,
libshared],
[]],
[threads]],
]
src/udev/meson.build
+12 -6
View File
@@ -105,7 +105,8 @@ executable('ata_id',
'ata_id/ata_id.c',
include_directories : includes,
link_with : [libudev_internal,
libshared],
libshared,
libsystemd_internal],
install : true,
install_dir : udevlibexecdir)
@@ -113,7 +114,8 @@ executable('cdrom_id',
'cdrom_id/cdrom_id.c',
include_directories : includes,
link_with : [libudev_internal,
libshared],
libshared,
libsystemd_internal],
install : true,
install_dir : udevlibexecdir)
@@ -121,7 +123,8 @@ executable('collect',
'collect/collect.c',
include_directories : includes,
link_with : [libudev_internal,
libshared],
libshared,
libsystemd_internal],
install : true,
install_dir : udevlibexecdir)
@@ -132,7 +135,8 @@ executable('scsi_id',
'scsi_id/scsi.h',
include_directories : includes,
link_with : [libudev_internal,
libshared],
libshared,
libsystemd_internal],
install : true,
install_dir : udevlibexecdir)
@@ -140,7 +144,8 @@ executable('v4l_id',
'v4l_id/v4l_id.c',
include_directories : includes,
link_with : [libudev_internal,
libshared],
libshared,
libsystemd_internal],
install : true,
install_dir : udevlibexecdir)
@@ -150,7 +155,8 @@ executable('mtd_probe',
'mtd_probe/probe_smartmedia.c',
include_directories : includes,
link_with : [libudev_internal,
libshared],
libshared,
libsystemd_internal],
install : true,
install_dir : udevlibexecdir)