From 91354636e6a535be56990ffea78e483aad56ed05 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Thu, 12 May 2022 18:01:15 +0200 Subject: [PATCH] package/gnutls: add optional dependency on brotli, zlib, zstd Version 3.7.4 added compression options with brotli, zlib and zstd. These are automatically discovered, which makes their inclusion depend on the build order. Therefore, explicitly enable/disable them. Note that the configure help text says "--without-brotli" and "--without-zstd", but the options are actually --without-libbrotli and --without-libzstd. --without-zlib is correct in the help text. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- package/gnutls/gnutls.mk | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 2d37cfc65f..761a17bd20 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -48,6 +48,13 @@ else GNUTLS_CONF_OPTS += --disable-openssl-compatibility endif +ifeq ($(BR2_PACKAGE_BROTLI),y) +GNUTLS_CONF_OPTS += --with-libbrotli +GNUTLS_DEPENDENCIES += brotli +else +GNUTLS_CONF_OPTS += --without-libbrotli +endif + ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) GNUTLS_CONF_OPTS += --enable-cryptodev GNUTLS_DEPENDENCIES += cryptodev-linux @@ -73,6 +80,20 @@ else GNUTLS_CONF_OPTS += --with-included-unistring endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +GNUTLS_CONF_OPTS += --with-zlib +GNUTLS_DEPENDENCIES += zlib +else +GNUTLS_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +GNUTLS_CONF_OPTS += --with-libzstd +GNUTLS_DEPENDENCIES += zstd +else +GNUTLS_CONF_OPTS += --without-libzstd +endif + # Provide a default CA cert location ifeq ($(BR2_PACKAGE_P11_KIT),y) GNUTLS_CONF_OPTS += --with-default-trust-store-pkcs11=pkcs11:model=p11-kit-trust