From: Fabrice Fontaine Date: Mon, 29 Mar 2021 19:30:58 +0000 (+0200) Subject: package/gnutls: drop unrecognized option X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=580f1fccc73b6d8fe13d086bdd0fae2088ac0e52;p=buildroot.git package/gnutls: drop unrecognized option crywrap has been dropped since version 3.6.12 and https://github.com/gnutls/gnutls/commit/c991b5223140e4ef311afac0f25272e602238826 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index 15b930b6bd..cd853d1e74 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -23,8 +23,6 @@ config BR2_PACKAGE_GNUTLS_OPENSSL config BR2_PACKAGE_GNUTLS_TOOLS bool "install tools" - select BR2_PACKAGE_ARGP_STANDALONE \ - if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL help Install GnuTLS command line tools for various cryptographic tasks. diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 65bb4893e8..cf2dedb590 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -47,20 +47,6 @@ GNUTLS_CONF_OPTS += \ --with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \ --with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`" -# Consider crywrap as part of tools because it needs WCHAR, and it's so too -ifeq ($(BR2_PACKAGE_GNUTLS_TOOLS),) -GNUTLS_CONF_OPTS += --disable-crywrap -endif - -# Prerequisite for crywrap -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -GNUTLS_LIBS += -largp -GNUTLS_DEPENDENCIES += argp-standalone -endif - -# libidn support for nommu must exclude the crywrap wrapper (uses fork) -GNUTLS_CONF_OPTS += $(if $(BR2_USE_MMU),,--disable-crywrap) - ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) GNUTLS_CONF_OPTS += --enable-cryptodev GNUTLS_DEPENDENCIES += cryptodev-linux