Bump Buildroot Version to buildroot 2019_02_6
This commit is contained in:
@@ -29,6 +29,8 @@ Update gitignore accordingly, too.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Cc: Sam Voss <sam.voss@rockwellcollins.com>
|
||||
[Fabrice: Remove .gitignore so patch applies on 1.9.0]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
.gitignore | 2 ++
|
||||
buildconf | 24 +++++-------------------
|
||||
@@ -37,19 +39,6 @@ Cc: Sam Voss <sam.voss@rockwellcollins.com>
|
||||
example/Makefile.am | 2 +-
|
||||
5 files changed, 9 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/.gitignore b/.gitignore
|
||||
index 997e51e1..b6d6b5cb 100644
|
||||
--- a/.gitignore
|
||||
+++ b/.gitignore
|
||||
@@ -13,6 +13,8 @@ Makefile
|
||||
Makefile.in
|
||||
aclocal.m4
|
||||
autom4te.cache
|
||||
+compile
|
||||
+test-driver
|
||||
config.guess
|
||||
config.log
|
||||
config.status
|
||||
diff --git a/buildconf b/buildconf
|
||||
index 558dcb66..728b3397 100755
|
||||
--- a/buildconf
|
||||
@@ -95,19 +84,6 @@ index c6ff7535..6939d0d6 100644
|
||||
AM_MAINTAINER_MODE
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
|
||||
diff --git a/example/.gitignore b/example/.gitignore
|
||||
index 13448191..cac152b8 100644
|
||||
--- a/example/.gitignore
|
||||
+++ b/example/.gitignore
|
||||
@@ -20,8 +20,6 @@ sftp_write_nonblock
|
||||
config.h.in
|
||||
ssh2_exec
|
||||
ssh2_agent
|
||||
-libssh2_config.h
|
||||
-libssh2_config.h.in
|
||||
stamp-h2
|
||||
sftp_append
|
||||
sftp_write_sliding
|
||||
diff --git a/example/Makefile.am b/example/Makefile.am
|
||||
index 5cf5f071..41f65b12 100644
|
||||
--- a/example/Makefile.am
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 468e7a81a8121c06cb099eef2e17106b0b8c2e1d890b1c0e34e1951f182babb1 libssh2-1b3cbaff518f32e5b70650d4b7b52361b1410d37.tar.gz
|
||||
sha256 d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd libssh2-1.9.0.tar.gz
|
||||
sha256 e15ed284a15e80115467d6d7f030f0d89d8fabbecd78fb6e0f861f0cfc128fd9 COPYING
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSSH2_VERSION = 1b3cbaff518f32e5b70650d4b7b52361b1410d37
|
||||
LIBSSH2_SITE = $(call github,libssh2,libssh2,$(LIBSSH2_VERSION))
|
||||
LIBSSH2_VERSION = 1.9.0
|
||||
LIBSSH2_SITE = https://www.libssh2.org/download
|
||||
LIBSSH2_LICENSE = BSD
|
||||
LIBSSH2_LICENSE_FILES = COPYING
|
||||
LIBSSH2_INSTALL_STAGING = YES
|
||||
@@ -26,9 +26,12 @@ LIBSSH2_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr \
|
||||
# linking
|
||||
LIBSSH2_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`"
|
||||
else ifeq ($(BR2_PACKAGE_LIBSSH2_OPENSSL),y)
|
||||
LIBSSH2_DEPENDENCIES += openssl
|
||||
LIBSSH2_DEPENDENCIES += host-pkgconf openssl
|
||||
LIBSSH2_CONF_OPTS += --with-libssl-prefix=$(STAGING_DIR)/usr \
|
||||
--with-crypto=openssl
|
||||
# configure.ac forgets to link to dependent libraries of openssl breaking static
|
||||
# linking
|
||||
LIBSSH2_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
|
||||
endif
|
||||
|
||||
# Add zlib support if enabled
|
||||
|
||||
Reference in New Issue
Block a user