]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: add a missing versiondep to libcryptsetup-plugins target
authorFrantisek Sumsal <frantisek@sumsal.cz>
Tue, 27 Jul 2021 10:19:10 +0000 (12:19 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 27 Jul 2021 13:44:30 +0000 (14:44 +0100)
Otherwise the build sometimes fails in a racy way:

```
[274/1850] Compiling C object src/cryptsetup/cryptsetup-tokens/libcryptsetup-token-systemd-tpm2_static.a.p/cryptsetup-token-systemd-tpm2.c.o
FAILED: src/cryptsetup/cryptsetup-tokens/libcryptsetup-token-systemd-tpm2_static.a.p/cryptsetup-token-systemd-tpm2.c.o
cc -Isrc/cryptsetup/cryptsetup-tokens/libcryptsetup-token-systemd-tpm2_static.a.p (...) -c ../build/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c
../build/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c:12:10: fatal error: version.h: No such file or directory
   12 | #include "version.h"
         |          ^~~~~~~~~~~
         compilation terminated.
```

Follow-up to d1ae38d85ae458ba8126465d25789e2721a75dba.

meson.build

index cb023f7f132722b65748d279b80ff8f349c3f575..c1bc33d8f5e0b18a4723e9f503a989e459f9a5d3 100644 (file)
@@ -1778,7 +1778,7 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1
                         'cryptsetup-token-systemd-tpm2',
                         link_args : ['-shared',
                                      '-Wl,--version-script=' + cryptsetup_token_sym_path],
-                        dependencies : libshared_deps + [libcryptsetup],
+                        dependencies : libshared_deps + [libcryptsetup, versiondep],
                         link_with : [libshared],
                         link_whole : [cryptsetup_token_systemd_tpm2_static],
                         link_depends : cryptsetup_token_sym,