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]: 6b794e49d1

Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit c4a56d3f6d45898c889b68f1ab785dcabcce31bf)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
TIAN Yuanhao 2024-11-07 05:43:42 -08:00 committed by Peter Korsgaard
parent ecec8f8f32
commit 84754f5c87

View File

@ -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