From 1b8e5c93d3789c900fbd5ab62badfe4d4eec61a6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 18:57:17 +0200 Subject: [PATCH] package/gnutls: disable tpm2-tss Disable tpm2-tss to avoid the following circular dependency if BR2_PACKAGE_TPM2_TSS_FAPI is selected: tpm2-tss -> libcurl -> gnutls -> tmp2-tss resulting in the following build failure of libcurl or rtmpdump since commit caff4179a4481233257f5f475ca57ce9061af900: configure: error: TLS not detected, you will not be able to use HTTPS, FTPS, NTLM and more. Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this. [...] In file included from rtmp.c:32: rtmp_sys.h:110:10: fatal error: gnutls/gnutls.h: No such file or directory 110 | #include | ^~~~~~~~~~~~~~~~~ Fixes: caff4179a4481233257f5f475ca57ce9061af900 - http://autobuild.buildroot.org/results/72e1843de650c9ed4795f1141e9fd485b71a14c3 - http://autobuild.buildroot.org/results/918f0f7efa810b17f6d2266a890bf0150cbed146 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gnutls/gnutls.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 8302194812..cf2f02cc9d 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -30,6 +30,7 @@ GNUTLS_CONF_OPTS = \ --without-librt-prefix \ --without-libz-prefix \ --without-tpm \ + --without-tpm2 \ $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) \ $(if $(BR2_PACKAGE_GNUTLS_ENABLE_SSL2),--enable,--disable)-ssl2-support \ $(if $(BR2_PACKAGE_GNUTLS_ENABLE_GOST),--enable,--disable)-gost @@ -99,13 +100,6 @@ else GNUTLS_CONF_OPTS += --without-p11-kit endif -ifeq ($(BR2_PACKAGE_TPM2_TSS),y) -GNUTLS_CONF_OPTS += --with-tpm2 -GNUTLS_DEPENDENCIES += tpm2-tss -else -GNUTLS_CONF_OPTS += --without-tpm2 -endif - ifeq ($(BR2_PACKAGE_ZLIB),y) GNUTLS_CONF_OPTS += --with-zlib GNUTLS_DEPENDENCIES += zlib