diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-04-12 15:59:40 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2018-04-12 15:59:40 +0930 |
| commit | a8d11267c2bfad3ff410ea342778f2791982da51 (patch) | |
| tree | 98f7058a6f58fc3f63d1e8bb499531a0a01e15fd /package/libssh2 | |
| parent | e17668bbe3538d42b0a0fab64251e60ff6c81d68 (diff) | |
| parent | 9565a37e0d2aa3c5fb9a4148760c490f2e5226d4 (diff) | |
| download | buildroot-2018.02-op-build.tar.gz buildroot-2018.02-op-build.zip | |
Merge tag '2018.02.1' into 2018.02-op-build2018.02-op-build
Release 2018.02.1
Diffstat (limited to 'package/libssh2')
| -rw-r--r-- | package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch b/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch new file mode 100644 index 0000000000..76e08c51a9 --- /dev/null +++ b/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch @@ -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 + |
