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.

diff --git a/src/analyze/meson.build b/src/analyze/meson.build
index af9f5d52cd873a58332f27f626673efb5768f834..1f40ba85592575b14d495734e6248577b647092d 100644 (file)
--- 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 db08b264cc848ac3b575878bd24b786039ee635a..55bbe2ec9a2767d0074a84a1d8320478cce63a87 100644 (file)
--- 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 ccd4a327ce31f6230c00fe0144cb88e5ec2d0ae3..fe911c5a2f3152a029a3f1af0c9a488cc46e7964 100644 (file)
--- 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 bb3c3338ba251f0266b95a96f4504a90792c2d72..6fa7f68f35d435d970ec1dbea639817e32fa9647 100644 (file)
--- 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 50060646ba9f82ea78bf8a1d2fa2daf41e65d74c..cbfca8720374434617f77325333fd001f6b6dc6c 100644 (file)
--- 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 437e58ecd834ef179f53a1007c5798c9457e339f..08634869ce244bedc4e8820e3513b71a461ce92f 100644 (file)
--- 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,
                 ],
         },