Bump buildroot to 2019.02
This commit is contained in:
@@ -19,4 +19,36 @@ config BR2_PACKAGE_LIBCURL_VERBOSE
|
||||
help
|
||||
Enable verbose text strings
|
||||
|
||||
config BR2_PACKAGE_LIBCURL_TLS_SUPPORT
|
||||
bool
|
||||
default y if BR2_PACKAGE_OPENSSL
|
||||
default y if BR2_PACKAGE_GNUTLS
|
||||
default y if BR2_PACKAGE_LIBNSS
|
||||
default y if BR2_PACKAGE_MBEDTLS
|
||||
|
||||
choice
|
||||
prompt "SSL/TLS library to use"
|
||||
depends on BR2_PACKAGE_LIBCURL_TLS_SUPPORT
|
||||
|
||||
config BR2_PACKAGE_LIBCURL_OPENSSL
|
||||
bool "OpenSSL"
|
||||
depends on BR2_PACKAGE_OPENSSL
|
||||
|
||||
config BR2_PACKAGE_LIBCURL_GNUTLS
|
||||
bool "GnuTLS"
|
||||
depends on BR2_PACKAGE_GNUTLS
|
||||
|
||||
config BR2_PACKAGE_LIBCURL_LIBNSS
|
||||
bool "NSS"
|
||||
depends on BR2_PACKAGE_LIBNSS
|
||||
|
||||
config BR2_PACKAGE_LIBCURL_MBEDTLS
|
||||
bool "mbed TLS"
|
||||
depends on BR2_PACKAGE_MBEDTLS
|
||||
|
||||
endchoice
|
||||
|
||||
comment "A TLS library is needed for SSL/TLS support"
|
||||
depends on !BR2_PACKAGE_LIBCURL_TLS_SUPPORT
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://curl.haxx.se/download/curl-7.62.0.tar.xz.asc
|
||||
# https://curl.haxx.se/download/curl-7.64.0.tar.xz.asc
|
||||
# with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
|
||||
sha256 dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1 curl-7.62.0.tar.xz
|
||||
sha256 5f3849ec38ddb927e79f514bf948890c41b8d1407286a49609b8fb1585931095 COPYING
|
||||
sha256 2f2f13fa34d44aa29cb444077ad7dc4dc6d189584ad552e0aaeb06e608af6001 curl-7.64.0.tar.xz
|
||||
sha256 8c8824f50e73a021f5dde1fccbf69685939247399a33a32abab1fa448c9ddabb COPYING
|
||||
|
||||
@@ -4,12 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCURL_VERSION = 7.62.0
|
||||
LIBCURL_VERSION = 7.64.0
|
||||
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
|
||||
LIBCURL_SITE = https://curl.haxx.se/download
|
||||
LIBCURL_DEPENDENCIES = host-pkgconf \
|
||||
$(if $(BR2_PACKAGE_ZLIB),zlib) \
|
||||
$(if $(BR2_PACKAGE_LIBIDN),libidn) \
|
||||
$(if $(BR2_PACKAGE_RTMPDUMP),rtmpdump)
|
||||
LIBCURL_LICENSE = curl
|
||||
LIBCURL_LICENSE_FILES = COPYING
|
||||
@@ -20,7 +19,8 @@ LIBCURL_INSTALL_STAGING = YES
|
||||
# probably almost never used. See
|
||||
# http://curl.haxx.se/docs/manpage.html#--ntlm.
|
||||
LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \
|
||||
--enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug
|
||||
--enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug \
|
||||
--without-polarssl
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
LIBCURL_CONF_OPTS += --enable-threaded-resolver
|
||||
@@ -36,7 +36,7 @@ endif
|
||||
|
||||
LIBCURL_CONFIG_SCRIPTS = curl-config
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y)
|
||||
LIBCURL_DEPENDENCIES += openssl
|
||||
# configure adds the cross openssl dir to LD_LIBRARY_PATH which screws up
|
||||
# native stuff during the rest of configure when target == host.
|
||||
@@ -45,19 +45,31 @@ LIBCURL_DEPENDENCIES += openssl
|
||||
LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)/lib:/usr/lib
|
||||
LIBCURL_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr \
|
||||
--with-ca-path=/etc/ssl/certs
|
||||
else ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
LIBCURL_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr
|
||||
else
|
||||
LIBCURL_CONF_OPTS += --without-ssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL_GNUTLS),y)
|
||||
LIBCURL_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr \
|
||||
--with-ca-fallback
|
||||
LIBCURL_DEPENDENCIES += gnutls
|
||||
else ifeq ($(BR2_PACKAGE_LIBNSS),y)
|
||||
else
|
||||
LIBCURL_CONF_OPTS += --without-gnutls
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL_LIBNSS),y)
|
||||
LIBCURL_CONF_OPTS += --with-nss=$(STAGING_DIR)/usr
|
||||
LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`"
|
||||
LIBCURL_DEPENDENCIES += libnss
|
||||
else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
|
||||
else
|
||||
LIBCURL_CONF_OPTS += --without-nss
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL_MBEDTLS),y)
|
||||
LIBCURL_CONF_OPTS += --with-mbedtls=$(STAGING_DIR)/usr
|
||||
LIBCURL_DEPENDENCIES += mbedtls
|
||||
else
|
||||
LIBCURL_CONF_OPTS += --without-ssl --without-gnutls \
|
||||
--without-polarssl --without-nss --without-mbedtls
|
||||
LIBCURL_CONF_OPTS += --without-mbedtls
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_C_ARES),y)
|
||||
@@ -67,6 +79,13 @@ else
|
||||
LIBCURL_CONF_OPTS += --disable-ares
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBIDN2),y)
|
||||
LIBCURL_DEPENDENCIES += libidn2
|
||||
LIBCURL_CONF_OPTS += --with-libidn2
|
||||
else
|
||||
LIBCURL_CONF_OPTS += --without-libidn2
|
||||
endif
|
||||
|
||||
# Configure curl to support libssh2
|
||||
ifeq ($(BR2_PACKAGE_LIBSSH2),y)
|
||||
LIBCURL_DEPENDENCIES += libssh2
|
||||
@@ -82,10 +101,17 @@ else
|
||||
LIBCURL_CONF_OPTS += --without-brotli
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NGHTTP2),y)
|
||||
LIBCURL_DEPENDENCIES += nghttp2
|
||||
LIBCURL_CONF_OPTS += --with-nghttp2
|
||||
else
|
||||
LIBCURL_CONF_OPTS += --without-nghttp2
|
||||
endif
|
||||
|
||||
define LIBCURL_FIX_DOT_PC
|
||||
printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in
|
||||
endef
|
||||
LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_OPENSSL),LIBCURL_FIX_DOT_PC)
|
||||
LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_LIBCURL_OPENSSL),LIBCURL_FIX_DOT_PC)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CURL),)
|
||||
define LIBCURL_TARGET_CLEANUP
|
||||
|
||||
Reference in New Issue
Block a user