Skip to content

Commit

Permalink
package/gnutls: fix configure options
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Signed-off-by: Arnout Vandecappelle <[email protected]>
  • Loading branch information
tianyuanhao authored and arnout committed Dec 4, 2024
1 parent 1eec67d commit c4a56d3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions package/gnutls/gnutls.mk
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ HOST_GNUTLS_CONF_OPTS = \
--without-tpm \
--without-tpm2 \
--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)
Expand All @@ -77,10 +77,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)
Expand Down Expand Up @@ -110,10 +110,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
Expand Down

0 comments on commit c4a56d3

Please sign in to comment.