From 99c645b81aa47899ae3e0f920947a7d86cca5a86 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Tue, 27 Jul 2021 12:19:10 +0200 Subject: [PATCH] meson: add a missing versiondep to libcryptsetup-plugins target 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index cb023f7f132..c1bc33d8f5e 100644 --- a/meson.build +++ b/meson.build @@ -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, -- 2.47.3