diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-10-29 01:31:40 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-10-29 14:23:49 +0900 |
| commit | 26f4d32365eff9d9bbd77e6c04de10ff6d6d7791 (patch) | |
| tree | 8c7266244953d7ccf4a39536165b09fbc24a3990 | |
| parent | 01ab92af710f565ba6b11c9267ca2aa7e1ffdad1 (diff) | |
| download | systemd-26f4d32365eff9d9bbd77e6c04de10ff6d6d7791.tar.gz | |
meson: drop libsystemd_network from several binaries
This reduces the size of udevadm:
Before:
```
$ ll udevadm
-rwxrwxr-x 1 watanabe watanabe 1203800 Oct 29 01:36 udevadm
```
After:
```
$ ll udevadm
-rwxrwxr-x 1 watanabe watanabe 1094384 Oct 29 01:38 udevadm
```
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | src/fuzz/meson.build | 1 | ||||
| -rw-r--r-- | src/libsystemd-network/meson.build | 4 | ||||
| -rw-r--r-- | src/network/meson.build | 3 | ||||
| -rw-r--r-- | src/test/meson.build | 5 | ||||
| -rw-r--r-- | src/udev/meson.build | 1 |
6 files changed, 3 insertions, 12 deletions
diff --git a/meson.build b/meson.build index 5cfc24c2d6..dba721208b 100644 --- a/meson.build +++ b/meson.build @@ -3188,7 +3188,6 @@ public_programs += executable( c_args : '-DLOG_REALM=LOG_REALM_UDEV', include_directories : includes, link_with : [libudev_core, - libsystemd_network, libudev_static], dependencies : [versiondep, threads, diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build index 01f119fcd0..d984382020 100644 --- a/src/fuzz/meson.build +++ b/src/fuzz/meson.build @@ -108,7 +108,6 @@ fuzzers += [ [['src/fuzz/fuzz-udev-rules.c'], [libudev_core, libudev_static, - libsystemd_network, libshared], [threads, libacl]], diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build index 7fa0c67956..a4c74222cb 100644 --- a/src/libsystemd-network/meson.build +++ b/src/libsystemd-network/meson.build @@ -17,6 +17,7 @@ sources = files(''' arp-util.h arp-util.c network-internal.c + network-internal.h sd-ndisc.c ndisc-internal.h ndisc-router.h @@ -42,10 +43,7 @@ sources = files(''' sd-lldp.c '''.split()) -network_internal_h = files('network-internal.h') - libsystemd_network = static_library( 'systemd-network', sources, - network_internal_h, include_directories : includes) diff --git a/src/network/meson.build b/src/network/meson.build index c2a197162f..86cca329c3 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -171,7 +171,7 @@ systemd_networkd_wait_online_sources = files(''' wait-online/manager.c wait-online/manager.h wait-online/wait-online.c -'''.split()) + network_internal_h +'''.split()) networkctl_sources = files('networkctl.c') @@ -214,7 +214,6 @@ if conf.get('ENABLE_NETWORKD') == 1 libnetworkd_core = static_library( 'networkd-core', sources, - network_internal_h, networkd_gperf_c, networkd_network_gperf_c, netdev_gperf_c, diff --git a/src/test/meson.build b/src/test/meson.build index e4ce8ac51a..11bb3db23a 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -126,8 +126,7 @@ tests += [ [['src/test/test-dns-domain.c'], [libcore, - libshared, - libsystemd_network], + libshared], []], [['src/test/test-boot-timestamps.c'], @@ -529,7 +528,6 @@ tests += [ libjournal_core, libudev_core, libudev_static, - libsystemd_network, libshared], [threads, libseccomp, @@ -765,7 +763,6 @@ tests += [ [['src/test/test-udev.c'], [libudev_core, libudev_static, - libsystemd_network, libshared], [threads, librt, diff --git a/src/udev/meson.build b/src/udev/meson.build index aa23b07090..f8431b3da4 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -202,7 +202,6 @@ fuzzers += [ 'src/fuzz/fuzz.h'], [libudev_core, libudev_static, - libsystemd_network, libshared], [threads, libacl]], |