From 3292f8741257019c2b7b791335852d8d438f5a76 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Thu, 12 May 2022 18:01:16 +0200 Subject: [PATCH] package/gnutls: libunistring is not optional Since the very beginning, libunistring was a mandatory dependency of gnutls. However, it would use its internal copy if libunistring was not selected. We never want that, so make libunistring an actual mandatory dependency. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- package/gnutls/Config.in | 3 +-- package/gnutls/gnutls.mk | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index 28982b15a1..59af32bf1e 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -2,10 +2,9 @@ config BR2_PACKAGE_GNUTLS bool "gnutls" # https://gitlab.com/gnutls/gnutls/issues/203 depends on !BR2_STATIC_LIBS - # gnulib requires a library that implements wctomb(). - # This is noticed only when linking with libgnutls.so. depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBTASN1 + select BR2_PACKAGE_LIBUNISTRING select BR2_PACKAGE_NETTLE help GnuTLS is a secure communications library implementing the SSL diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 761a17bd20..f7f3e046e9 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -12,7 +12,7 @@ GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) GNUTLS_LICENSE_FILES = doc/COPYING.LESSER -GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle +GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 libunistring nettle GNUTLS_CPE_ID_VENDOR = gnu GNUTLS_CONF_OPTS = \ --disable-doc \ @@ -20,6 +20,7 @@ GNUTLS_CONF_OPTS = \ --disable-libdane \ --disable-rpath \ --disable-tests \ + --without-included-unistring \ --without-libcrypto-prefix \ --without-libdl-prefix \ --without-libev-prefix \ @@ -74,12 +75,6 @@ else GNUTLS_CONF_OPTS += --without-p11-kit endif -ifeq ($(BR2_PACKAGE_LIBUNISTRING),y) -GNUTLS_DEPENDENCIES += libunistring -else -GNUTLS_CONF_OPTS += --with-included-unistring -endif - ifeq ($(BR2_PACKAGE_ZLIB),y) GNUTLS_CONF_OPTS += --with-zlib GNUTLS_DEPENDENCIES += zlib