Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -4,28 +4,31 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSSH2_VERSION = 1.7.0
|
||||
LIBSSH2_SITE = http://www.libssh2.org/download
|
||||
LIBSSH2_VERSION = 616fd4d1b3e4a55de67c48819fefca83132126b5
|
||||
LIBSSH2_SITE = $(call github,libssh2,libssh2,$(LIBSSH2_VERSION))
|
||||
LIBSSH2_LICENSE = BSD
|
||||
LIBSSH2_LICENSE_FILES = COPYING
|
||||
LIBSSH2_INSTALL_STAGING = YES
|
||||
LIBSSH2_CONF_OPTS = --disable-examples-build
|
||||
|
||||
# Dependency is either on libgcrypt or openssl, guaranteed in Config.in.
|
||||
# Favour libgcrypt.
|
||||
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
# building from a git clone
|
||||
LIBSSH2_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSSH2_MBEDTLS),y)
|
||||
LIBSSH2_DEPENDENCIES += mbedtls
|
||||
LIBSSH2_CONF_OPTS += --with-libmbedcrypto-prefix=$(STAGING_DIR)/usr \
|
||||
--with-crypto=mbedtls
|
||||
else ifeq ($(BR2_PACKAGE_LIBSSH2_LIBGCRYPT),y)
|
||||
LIBSSH2_DEPENDENCIES += libgcrypt
|
||||
LIBSSH2_CONF_OPTS += --with-libgcrypt \
|
||||
--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
|
||||
--without-openssl
|
||||
LIBSSH2_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr \
|
||||
--with-crypto=libgcrypt
|
||||
# configure.ac forgets to link to dependent libraries of gcrypt breaking static
|
||||
# linking
|
||||
LIBSSH2_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`"
|
||||
else
|
||||
else ifeq ($(BR2_PACKAGE_LIBSSH2_OPENSSL),y)
|
||||
LIBSSH2_DEPENDENCIES += openssl
|
||||
LIBSSH2_CONF_OPTS += --with-openssl \
|
||||
--with-libssl-prefix=$(STAGING_DIR)/usr \
|
||||
--without-libgcrypt
|
||||
LIBSSH2_CONF_OPTS += --with-libssl-prefix=$(STAGING_DIR)/usr \
|
||||
--with-crypto=openssl
|
||||
endif
|
||||
|
||||
# Add zlib support if enabled
|
||||
@@ -37,4 +40,10 @@ else
|
||||
LIBSSH2_CONF_OPTS += --without-libz
|
||||
endif
|
||||
|
||||
HOST_LIBSSH2_DEPENDENCIES += host-openssl
|
||||
HOST_LIBSSH2_CONF_OPTS += --with-openssl \
|
||||
--with-libssl-prefix=$(HOST_DIR)/usr \
|
||||
--without-libgcrypt
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user