diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-06-21 06:05:15 -0400 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-06-21 12:05:15 +0200 |
| commit | 4b57a2720029ba0b9c7bb676b1444cb574437f20 (patch) | |
| tree | 376f5f8b3d963763cb01ea987a1bfccc879ea8d8 | |
| parent | 9d3c1efaa38843b4e71e4072922a8c4ff7f44a04 (diff) | |
| download | systemd-4b57a2720029ba0b9c7bb676b1444cb574437f20.tar.gz | |
meson: add -pthreads and more libs when -Dlink-udev-shared=false (#6159)
Three binaries would fail to link when ld.bfd was used and link-udev-shared was
false. Add -pthreads (again) to the failing binaries and synchronize the
dependency list between libsystemd-shared .a and .so versions.
Apart from allowing the build to succeed, this shouldn't have much effect becuase
systemd-networkd was already using pthreads.
Fixes #5828.
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | src/network/meson.build | 4 | ||||
| -rw-r--r-- | src/shared/meson.build | 40 |
3 files changed, 19 insertions, 26 deletions
diff --git a/meson.build b/meson.build index 0c6293dba4..cab08dc67d 100644 --- a/meson.build +++ b/meson.build @@ -2175,6 +2175,7 @@ if conf.get('ENABLE_NETWORKD', false) libsystemd_network, libudev_internal, libshared], + dependencies : [threads], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) diff --git a/src/network/meson.build b/src/network/meson.build index 521b21a18f..35ecd86379 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -133,7 +133,7 @@ if conf.get('ENABLE_NETWORKD', false) libudev_internal, libsystemd_network, libshared], - []], + [threads]], [['src/network/test-network-tables.c', 'src/network/test-network-tables.c', @@ -143,7 +143,7 @@ if conf.get('ENABLE_NETWORKD', false) libudev_core, libsystemd_network, libshared], - [], + [threads], '', '', [], [network_include_dir] + libudev_core_includes], ] diff --git a/src/shared/meson.build b/src/shared/meson.build index a9a5b4a6d4..2eaef11a2d 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -122,6 +122,20 @@ endif libshared_name = 'systemd-shared-@0@'.format(meson.project_version()) +libshared_deps = [threads, + librt, + libcap, + libacl, + libcryptsetup, + libgcrypt, + libiptc, + libseccomp, + libselinux, + libidn, + libxz, + liblz4, + libblkid] + libshared = shared_library( libshared_name, shared_sources, @@ -132,19 +146,7 @@ libshared = shared_library( include_directories : includes, link_args : ['-shared'], c_args : ['-fvisibility=default'], - dependencies : [threads, - librt, - libcap, - libacl, - libcryptsetup, - libgcrypt, - libiptc, - libseccomp, - libselinux, - libidn, - libxz, - liblz4, - libblkid], + dependencies : libshared_deps, install : true, install_dir : rootlibexecdir) @@ -153,14 +155,4 @@ libshared_static = static_library( shared_sources, basic_sources, include_directories : includes, - dependencies : [threads, - librt, - libcap, - libacl, - libcryptsetup, - libseccomp, - libselinux, - libidn, - libxz, - liblz4, - libblkid]) + dependencies : libshared_deps) |