8b575ffd1b
curl can be statically linked with mbedtls, in this case build will fail on: kex.c:(.text+0x1be0): undefined reference to `mbedtls_mpi_read_binary' This is due to the fact that CURL_LIBRARIES does not contain mbedtls library: CURL_LIBRARIES:INTERNAL=curl;cares;ssh2;ssh2;z;ssl;crypto;z;z;crypto;z;z;ssl;z;z;crypto;z even if libcurl.pc is correct: Libs.private: -lcares -lssh2 -L/home/fabrice/buildroot/output/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lssh2 /home/fabrice/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmbedcrypto.a /home/fabrice/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmbedcrypto.a -L/home/fabrice/buildroot/output/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -L/home/fabrice/buildroot/output/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lz -lssl -lcrypto -lssl -lz -lz -lcrypto -lz -lz This full library path is added by patch 0002-acinclude.m4-add-mbedtls-to-LIBS.patch on libssh2 so update it to replace $LIBMBDEDCRYPTO by -lmbedcrypto Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
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>
|
|
[Fabrice: Replace $LIBMBEDCRYTO by -lmdedcrypto to avoid adding a full
|
|
library path to libssh2.pc as it raises build failures on some packages
|
|
such as xerces]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
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 -lmbedcrypto"
|
|
found_crypto="$1"
|
|
support_clear_memory=yes
|
|
])
|
|
--
|
|
2.16.2
|
|
|