50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
|
From c0b3dbb43aa3a38c47311556c85eadc6072e2d68 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||
|
|
Date: Tue, 14 Feb 2017 22:02:26 +0100
|
||
|
|
Subject: [PATCH] Fix Libs.private flags for mbedtls
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Static linking with bctoolbox fails when using pkg-config as the
|
||
|
|
generated bctoolbox.pc file only consists of an '-L' string without any
|
||
|
|
search path or libraries flags.
|
||
|
|
|
||
|
|
That's because of an typo in `mbedtls_library_path`. However,
|
||
|
|
`mbedtls_library_path` contains a string of the mbedtls libraries
|
||
|
|
concatenated by an ';' which cannot be parsed by pkg-config.
|
||
|
|
|
||
|
|
Therefore, use `MBEDTLS_LIBRARY` instead of `MBEDTLS_LIBRARIES` to get
|
||
|
|
the library path.
|
||
|
|
|
||
|
|
Furthermore, add the three mbedtls libraries *mbedtls*, *mbedcrypto*, and
|
||
|
|
*mbedx509* to `LIBS_PRIVATE` so these libraries are added to the
|
||
|
|
`Libs.private` field of bctoolbox.pc.
|
||
|
|
|
||
|
|
Upstream status: Pending
|
||
|
|
https://github.com/BelledonneCommunications/bctoolbox/pull/4
|
||
|
|
|
||
|
|
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index ed7aa00..4127f0e 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -103,8 +103,8 @@ else()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if(MBEDTLS_FOUND)
|
||
|
|
- get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH)
|
||
|
|
- set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedlts_library_path}")
|
||
|
|
+ get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARY}" PATH)
|
||
|
|
+ set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedtls_library_path} -lmbedtls -lmbedcrypto -lmbedx509")
|
||
|
|
endif()
|
||
|
|
if(POLARSSL_FOUND)
|
||
|
|
get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH)
|
||
|
|
--
|
||
|
|
2.11.1
|
||
|
|
|