From 84754f5c877207a9c62f3d1f4f972055ef6d1c7a Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Thu, 7 Nov 2024 05:43:42 -0800 Subject: [PATCH] package/gnutls: fix configure options Two configure option names have been changed since version 3.7.5 [1]: > Old: --without-libbrotli --without-libzstd (also --with-*) > New: --without-brotli --without-zstd (also --with-*) Fixes: configure: WARNING: unrecognized options: [...] --without-libbrotli, --without-libzstd [1]: https://gitlab.com/gnutls/gnutls/-/commit/6b794e49d1a14e43f9e08023f958364712c3c89a Signed-off-by: TIAN Yuanhao Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle (cherry picked from commit c4a56d3f6d45898c889b68f1ab785dcabcce31bf) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 04cecb5ce2..96e59134b2 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -58,11 +58,11 @@ HOST_GNUTLS_CONF_OPTS = \ --without-libz-prefix \ --without-tpm \ --disable-openssl-compatibility \ - --without-libbrotli \ + --without-brotli \ --without-idn \ --without-p11-kit \ --without-zlib \ - --without-libzstd + --without-zstd ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y) GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library) @@ -73,10 +73,10 @@ GNUTLS_CONF_OPTS += --disable-openssl-compatibility endif ifeq ($(BR2_PACKAGE_BROTLI),y) -GNUTLS_CONF_OPTS += --with-libbrotli +GNUTLS_CONF_OPTS += --with-brotli GNUTLS_DEPENDENCIES += brotli else -GNUTLS_CONF_OPTS += --without-libbrotli +GNUTLS_CONF_OPTS += --without-brotli endif ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) @@ -106,10 +106,10 @@ GNUTLS_CONF_OPTS += --without-zlib endif ifeq ($(BR2_PACKAGE_ZSTD),y) -GNUTLS_CONF_OPTS += --with-libzstd +GNUTLS_CONF_OPTS += --with-zstd GNUTLS_DEPENDENCIES += zstd else -GNUTLS_CONF_OPTS += --without-libzstd +GNUTLS_CONF_OPTS += --without-zstd endif # Provide a default CA cert location