Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -0,0 +1,121 @@
|
||||
From 39a2a444a32896bd2dab37c9b247ccfd11ff4693 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Mon, 30 Oct 2017 19:29:12 +0100
|
||||
Subject: [PATCH] buildsystem: drop custom buildconf script, rely on autoreconf
|
||||
|
||||
The buildconf script is currently required, because we need to copy a
|
||||
header around, because it is used both from the library and the examples
|
||||
sources.
|
||||
|
||||
However, having a custom 'buildconf'-like script is not needed if we can
|
||||
ensure that the header / exists by the time it is needed. For That, we
|
||||
can just append the src/ directory to the headers search path for the
|
||||
examples.
|
||||
|
||||
And then it means we no longer need to generate the same header twice,
|
||||
so we remove the second one from configure.ac.
|
||||
|
||||
Now, we can just call "autoreconf -fi" to generate the autotools files,
|
||||
instead of relying on the canned sequence in "buildconf", since
|
||||
autoreconf has now long known what to do at the correct moment (future
|
||||
versions of autotools, automake, autopoint, autoheader etc... may
|
||||
require an other ordering, or other intermediate steps, etc...).
|
||||
|
||||
Eventually, get rid of buildconf now it is no longer needed. In fact, we
|
||||
really keep it for legacy, but have it just call autoreconf (and print a
|
||||
nice user-friendly warning).
|
||||
|
||||
Update gitignore accordingly, too.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Cc: Sam Voss <sam.voss@rockwellcollins.com>
|
||||
---
|
||||
.gitignore | 2 ++
|
||||
buildconf | 24 +++++-------------------
|
||||
configure.ac | 2 +-
|
||||
example/.gitignore | 2 --
|
||||
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
|
||||
+++ b/buildconf
|
||||
@@ -1,22 +1,8 @@
|
||||
#!/bin/sh
|
||||
|
||||
-LIBTOOLIZE="libtoolize"
|
||||
+echo "***" >&2
|
||||
+echo "*** Do not use buildconf. Instead, just use: autoreconf -fi" >&2
|
||||
+echo "*** Doing it for you now, but buildconf may disapear in the future." >&2
|
||||
+echo "***" >&2
|
||||
|
||||
-if [ "x`which $LIBTOOLIZE`" = "x" ]; then
|
||||
- LIBTOOLIZE="glibtoolize"
|
||||
-fi
|
||||
-
|
||||
-if [ "x`which $LIBTOOLIZE`" = "x" ]; then
|
||||
- echo "Neither libtoolize nor glibtoolize could be found!"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-${LIBTOOLIZE} --copy --automake --force
|
||||
-${ACLOCAL:-aclocal} -I m4 $ACLOCAL_FLAGS
|
||||
-${AUTOHEADER:-autoheader}
|
||||
-# copy the private libssh2_config.h.in to the examples dir so that
|
||||
-# it can be included without pointing the include path to the private
|
||||
-# source dir
|
||||
-cp src/libssh2_config.h.in example/libssh2_config.h.in
|
||||
-${AUTOCONF:-autoconf}
|
||||
-${AUTOMAKE:-automake} --add-missing --copy
|
||||
+${AUTORECONF:-autoreconf} -fi "${@}"
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c6ff7535..6939d0d6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2,7 +2,7 @@
|
||||
AC_INIT(libssh2, [-], libssh2-devel@cool.haxx.se)
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CONFIG_SRCDIR([src])
|
||||
-AC_CONFIG_HEADERS([src/libssh2_config.h example/libssh2_config.h])
|
||||
+AC_CONFIG_HEADERS([src/libssh2_config.h])
|
||||
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
|
||||
+++ b/example/Makefile.am
|
||||
@@ -13,5 +13,5 @@ if HAVE_SYS_UN_H
|
||||
noinst_PROGRAMS += x11
|
||||
endif
|
||||
|
||||
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/example
|
||||
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/example -I../src
|
||||
LDADD = $(top_builddir)/src/libssh2.la
|
||||
@@ -0,0 +1,31 @@
|
||||
From f4846473f0f0ec313f8ed7ff4cd9f59c1741465d Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Tue, 20 Mar 2018 20:21:53 +0200
|
||||
Subject: [PATCH] acinclude.m4: add mbedtls to LIBS
|
||||
|
||||
This is useful for static builds so that the Libs.private field in
|
||||
libssh2.pc contains correct info for the benefit of pkg-config users.
|
||||
Static link with libssh2 requires this information.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://github.com/libssh2/libssh2/pull/242
|
||||
|
||||
acinclude.m4 | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index c0e89a1a0c98..02c70845d27c 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -441,6 +441,7 @@ m4_case([$1],
|
||||
[mbedtls], [
|
||||
LIBSSH2_LIB_HAVE_LINKFLAGS([mbedcrypto], [], [#include <mbedtls/version.h>], [
|
||||
AC_DEFINE(LIBSSH2_MBEDTLS, 1, [Use $1])
|
||||
+ LIBS="$LIBS $LIBMBEDCRYPTO"
|
||||
found_crypto="$1"
|
||||
support_clear_memory=yes
|
||||
])
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
config BR2_PACKAGE_LIBSSH2
|
||||
bool "libssh2"
|
||||
select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT
|
||||
select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_MBEDTLS || BR2_PACKAGE_LIBGCRYPT)
|
||||
help
|
||||
libssh2 is a client-side C library implementing the SSH2
|
||||
protocol as defined by Internet Drafts: SECSH-TRANS(22),
|
||||
@@ -8,3 +8,25 @@ config BR2_PACKAGE_LIBSSH2
|
||||
SECSH-FILEXFER(06)*, SECSH-DHGEX(04), and SECSH-NUMBERS(10)
|
||||
|
||||
http://www.libssh2.org/
|
||||
|
||||
if BR2_PACKAGE_LIBSSH2
|
||||
|
||||
choice
|
||||
prompt "Crypto Backend"
|
||||
help
|
||||
Select crypto library to be used in libssh2.
|
||||
|
||||
config BR2_PACKAGE_LIBSSH2_MBEDTLS
|
||||
bool "mbedtls"
|
||||
depends on BR2_PACKAGE_MBEDTLS
|
||||
|
||||
config BR2_PACKAGE_LIBSSH2_LIBGCRYPT
|
||||
bool "gcrypt"
|
||||
depends on BR2_PACKAGE_LIBGCRYPT
|
||||
|
||||
config BR2_PACKAGE_LIBSSH2_OPENSSL
|
||||
bool "openssl"
|
||||
depends on BR2_PACKAGE_OPENSSL
|
||||
|
||||
endchoice
|
||||
endif
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584 libssh2-1.7.0.tar.gz
|
||||
# Locally calculated
|
||||
sha256 e73d55cd512863aa6423c6e137039e3e1bcbf5ba87f130e7441132c2c78a5425 libssh2-616fd4d1b3e4a55de67c48819fefca83132126b5.tar.gz
|
||||
|
||||
@@ -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