NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnutls: use included unistring unless libunistring is selected

Browse Source 
Use the included copy of libunistring unless BR2_PACKAGE_LIBUNISTRING
is already selected.

The resulting gnutls library with libunistring included is about 1.2 MB
smaller than the sum of libgnutls and libunistring.

Signed-off-by: Sven Neumann <neumann@teufel.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Sven Neumann 2018-06-15 10:48:38 +02:00 committed by Thomas Petazzoni
parent b5da9637ec
commit 19448f40a0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/gnutls/Config.in
View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_GNUTLS
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBTASN1
select BR2_PACKAGE_LIBUNISTRING
select BR2_PACKAGE_NETTLE select BR2_PACKAGE_NETTLE
select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE
help help

10
package/gnutls/gnutls.mk
View File

@ -10,7 +10,7 @@ GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library) GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library)
GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER
GNUTLS_DEPENDENCIES = host-pkgconf libunistring libtasn1 nettle pcre GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre
GNUTLS_CONF_OPTS = \ GNUTLS_CONF_OPTS = \
--disable-doc \ --disable-doc \
--disable-guile \ --disable-guile \
@ -19,7 +19,6 @@ GNUTLS_CONF_OPTS = \
--enable-local-libopts \ --enable-local-libopts \
--enable-openssl-compatibility \ --enable-openssl-compatibility \
--with-libnettle-prefix=$(STAGING_DIR)/usr \ --with-libnettle-prefix=$(STAGING_DIR)/usr \
--with-libunistring-prefix=$(STAGING_DIR)/usr \
--with-librt-prefix=$(STAGING_DIR) \ --with-librt-prefix=$(STAGING_DIR) \
--without-tpm \ --without-tpm \
$(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools)
@ -82,6 +81,13 @@ else
GNUTLS_CONF_OPTS += --without-p11-kit GNUTLS_CONF_OPTS += --without-p11-kit
endif endif
ifeq ($(BR2_PACKAGE_LIBUNISTRING),y)
GNUTLS_CONF_OPTS += --with-libunistring-prefix=$(STAGING_DIR)/usr
GNUTLS_DEPENDENCIES += libunistring
else
GNUTLS_CONF_OPTS += --with-included-unistring
endif
ifeq ($(BR2_PACKAGE_ZLIB),y) ifeq ($(BR2_PACKAGE_ZLIB),y)
GNUTLS_CONF_OPTS += --with-zlib GNUTLS_CONF_OPTS += --with-zlib
GNUTLS_DEPENDENCIES += zlib GNUTLS_DEPENDENCIES += zlib