Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -0,0 +1,49 @@
|
||||
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
|
||||
|
||||
15
bsp/buildroot/package/bctoolbox/Config.in
Normal file
15
bsp/buildroot/package/bctoolbox/Config.in
Normal file
@@ -0,0 +1,15 @@
|
||||
config BR2_PACKAGE_BCTOOLBOX
|
||||
bool "bctoolbox"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
Utilities library used by Belledonne Communications
|
||||
softwares like belle-sip, mediastreamer2 and linphone.
|
||||
|
||||
Select BR2_PACKAGE_MBEDTLS (preferred) or
|
||||
BR2_PACKAGE_POLARSSL for crypto support.
|
||||
|
||||
https://github.com/BelledonneCommunications/bctoolbox
|
||||
|
||||
comment "bctoolbox needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
2
bsp/buildroot/package/bctoolbox/bctoolbox.hash
Normal file
2
bsp/buildroot/package/bctoolbox/bctoolbox.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 da7df7ff359a9829e9e6ef98dfe9fead0cf735b8a4a5da1b1047f467dee1b2a9 bctoolbox-0.4.0.tar.gz
|
||||
46
bsp/buildroot/package/bctoolbox/bctoolbox.mk
Normal file
46
bsp/buildroot/package/bctoolbox/bctoolbox.mk
Normal file
@@ -0,0 +1,46 @@
|
||||
################################################################################
|
||||
#
|
||||
# bctoolbox
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BCTOOLBOX_VERSION = 0.4.0
|
||||
BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION))
|
||||
BCTOOLBOX_LICENSE = GPLv2+
|
||||
BCTOOLBOX_LICENSE_FILES = COPYING
|
||||
BCTOOLBOX_INSTALL_STAGING = YES
|
||||
|
||||
# Set CMAKE_SKIP_RPATH to prevent bctoolbox from adding the rpath to
|
||||
# shared library.
|
||||
BCTOOLBOX_CONF_OPTS = \
|
||||
-DENABLE_STRICT=OFF \
|
||||
-DENABLE_TESTS_COMPONENT=OFF \
|
||||
-DENABLE_TESTS=OFF \
|
||||
-DGIT_EXECUTABLE=OFF \
|
||||
-DCMAKE_SKIP_RPATH=ON
|
||||
|
||||
# bctoolbox can be build with mbedTLS or PolarSSL support. If both
|
||||
# libraries are present, mbedTLS is preferred over PolarSSL.
|
||||
ifeq ($(BR2_PACKAGE_MBEDTLS),y)
|
||||
BCTOOLBOX_DEPENDENCIES += mbedtls
|
||||
BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=ON
|
||||
else
|
||||
BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_POLARSSL),y)
|
||||
BCTOOLBOX_DEPENDENCIES += polarssl
|
||||
BCTOOLBOX_CONF_OPTS += -DENABLE_POLARSSL=ON
|
||||
else
|
||||
BCTOOLBOX_CONF_OPTS += -DENABLE_POLARSSL=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON
|
||||
else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
||||
BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=ON
|
||||
else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user