Bump buildroot to 2019.02
This commit is contained in:
@@ -2,9 +2,10 @@ 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
|
||||
select BR2_PACKAGE_PCRE
|
||||
help
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.19.tar.xz.sig
|
||||
sha256 1936eb64f03aaefd6eb16cef0567457777618573826b94d03376bb6a4afadc44 gnutls-3.5.19.tar.xz
|
||||
# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.6.tar.xz.sig
|
||||
sha256 bb9acab8af2ac430edf45faaaa4ed2c51f86e57cb57689be6701aceef4732ca7 gnutls-3.6.6.tar.xz
|
||||
# Locally calculated
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 doc/COPYING
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GNUTLS_VERSION_MAJOR = 3.5
|
||||
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).19
|
||||
GNUTLS_VERSION_MAJOR = 3.6
|
||||
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).6
|
||||
GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
|
||||
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_FILES = doc/COPYING doc/COPYING.LESSER
|
||||
GNUTLS_DEPENDENCIES = host-pkgconf libunistring libtasn1 nettle pcre
|
||||
GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre
|
||||
GNUTLS_CONF_OPTS = \
|
||||
--disable-doc \
|
||||
--disable-guile \
|
||||
@@ -18,8 +18,6 @@ GNUTLS_CONF_OPTS = \
|
||||
--disable-rpath \
|
||||
--enable-local-libopts \
|
||||
--enable-openssl-compatibility \
|
||||
--with-libnettle-prefix=$(STAGING_DIR)/usr \
|
||||
--with-libunistring-prefix=$(STAGING_DIR)/usr \
|
||||
--with-librt-prefix=$(STAGING_DIR) \
|
||||
--without-tpm \
|
||||
$(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools)
|
||||
@@ -30,9 +28,8 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
|
||||
gl_cv_func_gettimeofday_clobber=no
|
||||
GNUTLS_INSTALL_STAGING = YES
|
||||
|
||||
# libpthread and libz autodetection poison the linkpath
|
||||
# libpthread autodetection poison the linkpath
|
||||
GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr)
|
||||
GNUTLS_CONF_OPTS += $(if $(BR2_PACKAGE_ZLIB),--with-libz-prefix=$(STAGING_DIR)/usr)
|
||||
|
||||
# gnutls needs libregex, but pcre can be used too
|
||||
# The check isn't cross-compile friendly
|
||||
@@ -61,9 +58,9 @@ GNUTLS_CONF_OPTS += --enable-cryptodev
|
||||
GNUTLS_DEPENDENCIES += cryptodev-linux
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBIDN),y)
|
||||
ifeq ($(BR2_PACKAGE_LIBIDN2),y)
|
||||
GNUTLS_CONF_OPTS += --with-idn
|
||||
GNUTLS_DEPENDENCIES += libidn
|
||||
GNUTLS_DEPENDENCIES += libidn2
|
||||
else
|
||||
GNUTLS_CONF_OPTS += --without-idn
|
||||
endif
|
||||
@@ -75,11 +72,18 @@ else
|
||||
GNUTLS_CONF_OPTS += --without-p11-kit
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
GNUTLS_CONF_OPTS += --with-zlib
|
||||
GNUTLS_DEPENDENCIES += zlib
|
||||
ifeq ($(BR2_PACKAGE_LIBUNISTRING),y)
|
||||
GNUTLS_CONF_OPTS += --with-libunistring-prefix=$(STAGING_DIR)/usr
|
||||
GNUTLS_DEPENDENCIES += libunistring
|
||||
else
|
||||
GNUTLS_CONF_OPTS += --without-zlib
|
||||
GNUTLS_CONF_OPTS += --with-included-unistring
|
||||
endif
|
||||
|
||||
# Provide a default CA cert location
|
||||
ifeq ($(BR2_PACKAGE_P11_KIT),y)
|
||||
GNUTLS_CONF_OPTS += --with-default-trust-store-pkcs11=pkcs11:model=p11-kit-trust
|
||||
else ifeq ($(BR2_PACKAGE_CA_CERTIFICATES),y)
|
||||
GNUTLS_CONF_OPTS += --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user