From 41965b3568f8310e342c93530f50538583ee2cbb Mon Sep 17 00:00:00 2001 From: fuldeka <260289618+fuldeka@users.noreply.github.com> Date: Fri, 3 Jul 2026 19:33:37 +0200 Subject: [PATCH] tree-wide: add missing libopenssl_cflags to targets using tpm2-util.h tpm2-util.h includes crypto-util.h, which requires OpenSSL compiler flags when HAVE_OPENSSL is defined. Add libopenssl_cflags to every build target that uses tpm2_cflags but was missing the transitive OpenSSL dependency. --- src/analyze/meson.build | 1 + src/cryptsetup/cryptsetup-tokens/meson.build | 1 + src/test/meson.build | 5 ++++- src/tpm2-setup/meson.build | 2 ++ src/udev/meson.build | 1 + src/veritysetup/meson.build | 1 + 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/analyze/meson.build b/src/analyze/meson.build index af9f5d52cd..1f40ba8559 100644 --- a/src/analyze/meson.build +++ b/src/analyze/meson.build @@ -56,6 +56,7 @@ executables += [ libshared, ], 'dependencies' : [ + libopenssl_cflags, libseccomp_cflags, tpm2_cflags, ], diff --git a/src/cryptsetup/cryptsetup-tokens/meson.build b/src/cryptsetup/cryptsetup-tokens/meson.build index db08b264cc..55bbe2ec9a 100644 --- a/src/cryptsetup/cryptsetup-tokens/meson.build +++ b/src/cryptsetup/cryptsetup-tokens/meson.build @@ -48,6 +48,7 @@ modules += [ 'sources' : cryptsetup_token_systemd_tpm2_sources, 'dependencies' : [ libcryptsetup_cflags, + libopenssl_cflags, tpm2_cflags, ], }, diff --git a/src/test/meson.build b/src/test/meson.build index ccd4a327ce..fe911c5a2f 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -300,7 +300,10 @@ executables += [ }, test_template + { 'sources' : files('test-creds.c'), - 'dependencies' : tpm2_cflags, + 'dependencies' : [ + libopenssl_cflags, + tpm2_cflags, + ], }, test_template + { 'sources' : files('test-crypto-util.c'), diff --git a/src/tpm2-setup/meson.build b/src/tpm2-setup/meson.build index bb3c3338ba..6fa7f68f35 100644 --- a/src/tpm2-setup/meson.build +++ b/src/tpm2-setup/meson.build @@ -23,6 +23,7 @@ executables += [ 'HAVE_TPM2', ], 'dependencies' : [ + libopenssl_cflags, tpm2_cflags, ], }, @@ -44,6 +45,7 @@ executables += [ 'HAVE_TPM2', ], 'dependencies' : [ + libopenssl_cflags, tpm2_cflags, ], }, diff --git a/src/udev/meson.build b/src/udev/meson.build index 50060646ba..cbfca87203 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -111,6 +111,7 @@ udev_dependencies = [ libblkid_cflags, libkmod_cflags, libmount_cflags, + libopenssl_cflags, libselinux_cflags, tpm2_cflags, ] diff --git a/src/veritysetup/meson.build b/src/veritysetup/meson.build index 437e58ecd8..08634869ce 100644 --- a/src/veritysetup/meson.build +++ b/src/veritysetup/meson.build @@ -10,6 +10,7 @@ executables += [ 'sources' : files('veritysetup.c'), 'dependencies' : [ libcryptsetup_cflags, + libopenssl_cflags, tpm2_cflags, ], },