generated from gaoyang3513/SDK_RK3288
[Mod] First commit
This commit is contained in:
@ -0,0 +1,37 @@
|
||||
From b7f14a800bbdad193f45695bc5b8c5173f3882ba Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 10 Feb 2019 17:51:05 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: fix mbedtls libraries in bctoolbox.pc
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
bctoolbox.pc should not contain the full libraries path, path should be
|
||||
given by -L and library names by -l
|
||||
So sent back the fix already suggested by Jörg Krause in
|
||||
https://github.com/BelledonneCommunications/bctoolbox/pull/4
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://github.com/BelledonneCommunications/bctoolbox/pull/7]
|
||||
---
|
||||
CMakeLists.txt | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 29f3eb6..b2f26c2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -101,9 +101,8 @@ else()
|
||||
endif()
|
||||
|
||||
if(MBEDTLS_FOUND)
|
||||
- get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH)
|
||||
- string(REPLACE ";" " " MBEDTLS_LIBRARIES_STR "${MBEDTLS_LIBRARIES}")
|
||||
- set(LIBS_PRIVATE "${LIBS_PRIVATE} ${MBEDTLS_LIBRARIES_STR}")
|
||||
+ 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)
|
||||
19
package/bctoolbox/Config.in
Normal file
19
package/bctoolbox/Config.in
Normal file
@ -0,0 +1,19 @@
|
||||
config BR2_PACKAGE_BCTOOLBOX
|
||||
bool "bctoolbox"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
Utilities library used by Belledonne Communications
|
||||
softwares like belle-sip, mediastreamer2 and linphone.
|
||||
|
||||
Select BR2_PACKAGE_MBEDTLS 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
|
||||
|
||||
comment "bctoolbox needs a toolchain not affected by GCC bug 64735"
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
3
package/bctoolbox/bctoolbox.hash
Normal file
3
package/bctoolbox/bctoolbox.hash
Normal file
@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 446b60e81a79b11e8212c44e312aeb0ce46e9ecf0269a35c492ecdca3e7428c3 bctoolbox-4.4.8.tar.gz
|
||||
sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt
|
||||
42
package/bctoolbox/bctoolbox.mk
Normal file
42
package/bctoolbox/bctoolbox.mk
Normal file
@ -0,0 +1,42 @@
|
||||
################################################################################
|
||||
#
|
||||
# bctoolbox
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BCTOOLBOX_VERSION = 4.4.8
|
||||
BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION))
|
||||
BCTOOLBOX_LICENSE = GPL-3.0+
|
||||
BCTOOLBOX_LICENSE_FILES = LICENSE.txt
|
||||
BCTOOLBOX_INSTALL_STAGING = YES
|
||||
|
||||
# Set CMAKE_SKIP_RPATH to prevent bctoolbox from adding the rpath to
|
||||
# shared library.
|
||||
BCTOOLBOX_CONF_OPTS = \
|
||||
-DENABLE_POLARSSL=OFF \
|
||||
-DENABLE_STRICT=OFF \
|
||||
-DENABLE_TESTS_COMPONENT=OFF \
|
||||
-DENABLE_TESTS=OFF \
|
||||
-DCMAKE_SKIP_RPATH=ON
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
BCTOOLBOX_DEPENDENCIES += libiconv
|
||||
BCTOOLBOX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -liconv"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MBEDTLS),y)
|
||||
BCTOOLBOX_DEPENDENCIES += mbedtls
|
||||
BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=ON
|
||||
else
|
||||
BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=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