tpm2-tss: depend on shared libraries

The code includes dlfcn.h even if --enable-static and --disable-shared
are passed to configure. There is an "#ifndef NO_DL ... #endif" wrapper
but NO_DL is never defined and adding "-DNO_DL" to CFLAGS causes other
compilation errors.

Fixes:
  http://autobuild.buildroot.net/results/cfc3bfef5e93329bf944a57947086d9ddc4fece3

Signed-off-by: Carlos Santos <casantos@datacom.com.br>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/tpm2-abrmd/Config.in b/package/tpm2-abrmd/Config.in
index 31c5ae7d6bf0d8494d9b3c0f82c732b9f41d8b3b..d18f736182cc3a0f64429de096b6712af8b6fc48 100644 (file)
--- a/package/tpm2-abrmd/Config.in
+++ b/package/tpm2-abrmd/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_TPM2_ABRMD
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus, libglib2
+       depends on !BR2_STATIC_LIBS # tpm2-tss
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_TPM2_TSS
@@ -20,6 +21,7 @@ config BR2_PACKAGE_TPM2_ABRMD
 
          https://github.com/tpm2-software/tpm2-abrmd
 
-comment "tpm2-abrmd needs a toolchain w/ wchar, threads"
+comment "tpm2-abrmd needs a toolchain w/ dynamic library, wchar, threads"
        depends on BR2_USE_MMU
-       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+               BR2_STATIC_LIBS

diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in
index 24cd4b8f9ae1788bb2aabd1b0120d8762f0b0b20..cc87e2a1bf187224310aa95947c8118849a9b3c9 100644 (file)
--- a/package/tpm2-tools/Config.in
+++ b/package/tpm2-tools/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_TPM2_TOOLS
        depends on BR2_USE_MMU # dbus, libglib
        depends on BR2_USE_WCHAR # libglib -> gettext
        depends on BR2_TOOLCHAIN_HAS_THREADS # libglib
+       depends on !BR2_STATIC_LIBS # tpm2-tss
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_LIBCURL
        select BR2_PACKAGE_LIBGLIB2
@@ -18,6 +19,7 @@ config BR2_PACKAGE_TPM2_TOOLS
 
          https://github.com/tpm2-software/tpm2-tools
 
-comment "tpm2-tools needs a toolchain w/ wchar, threads"
+comment "tpm2-tools needs a toolchain w/ dynamic library, wchar, threads"
        depends on BR2_USE_MMU
-       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+               BR2_STATIC_LIBS

diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in
index 4e299eccc174434fa76b3d70e2a3e3ee25b02fa4..933adb4b2ad87d7f43f9a08c4e959d446aeb0668 100644 (file)
--- a/package/tpm2-tss/Config.in
+++ b/package/tpm2-tss/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_TPM2_TSS
        bool "tpm2-tss"
+       depends on !BR2_STATIC_LIBS # dlfcn.h
        select BR2_PACKAGE_LIBURIPARSER
        select BR2_PACKAGE_OPENSSL
        help
@@ -30,3 +31,6 @@ config BR2_PACKAGE_TPM2_TSS
            Microsoft software TPM2 simulator.
 
          https://github.com/tpm2-software/tpm2-tss
+
+comment "tpm2-tss needs a toolchain w/ dynamic library"
+       depends on BR2_STATIC_LIBS