meson: replace -Dbuild-executor-shared=single with -Dsystemd-multicall-binary=true

This effectively reverts the meson config changes introduced in
0c6186695a. I wasn't happy with that form
back when it was commited, and in hindsight, I like it even less. Let's
just add a new option that hopefully is easier to understand and will
work better when new functionality is added in the future.

Now there are two options:
link-executor-shared (boolean, defaults to true)
  — "link (separate) systemd-executor to libsystemd-shared.so and libsystemd-core.so"
systemd-multicall-binary (also boolean, defaults to false)
  — "link systemd+systemd-executor as a single binary"

Build directories will need to be recreated again, sorry!
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-07-02 16:35:36 +02:00
parent d08882653d
commit fcb2c6c259
6 changed files with 11 additions and 12 deletions
+4 -2
View File
@@ -15,8 +15,10 @@ option('split-bin', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'sbin is not a symlink to bin')
option('link-udev-shared', type : 'boolean',
description : 'link systemd-udevd and its helpers to libsystemd-shared.so')
option('link-executor-shared', type : 'combo', choices : ['true', 'false', 'single'],
description : 'link systemd-executor to libsystemd-shared.so and libsystemd-core.so, or into systemd')
option('systemd-multicall-binary', type : 'boolean', value : false,
description : 'link systemd+systemd-executor as a single binary')
option('link-executor-shared', type : 'boolean',
description : 'link (separate) systemd-executor to libsystemd-shared.so and libsystemd-core.so')
option('link-systemctl-shared', type: 'boolean',
description : 'link systemctl against libsystemd-shared.so')
option('link-networkd-shared', type: 'boolean',