Jelajahi Sumber

package/bctoolbox: remove package

bctoolbox was only needed as a dependency of linphone, as is anyway
bundled in more recent versions of linphone, making a separate package
unnecessary.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas Petazzoni 2 bulan lalu
induk
melakukan
37d3a2dee3

+ 0 - 1
.checkpackageignore

@@ -229,7 +229,6 @@ package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch lib_pat
 package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch lib_patch.Upstream
 package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch lib_patch.Upstream
 package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch lib_patch.Upstream
-package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch lib_patch.Upstream
 package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch lib_patch.Upstream
 package/bearssl/0001-Fix-missing-objdir-dependency.patch lib_patch.Upstream
 package/benejson/0001-c-std.patch lib_patch.Upstream

+ 8 - 0
Config.in.legacy

@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2025.11"
 
+config BR2_PACKAGE_BCTOOLBOX
+	bool "bctoolbox has been removed"
+	select BR2_LEGACY
+	help
+	  This package has been removed as part of the linphone
+	  removal. In addition, newer version of linphone directly
+	  bundle bctoolbox making a separate package unnecessary.
+
 config BR2_PACKAGE_ORTP
 	bool "ortp has been removed"
 	select BR2_LEGACY

+ 0 - 1
package/Config.in

@@ -2163,7 +2163,6 @@ menu "Other"
 	source "package/atf/Config.in"
 	source "package/avro-c/Config.in"
 	source "package/basu/Config.in"
-	source "package/bctoolbox/Config.in"
 	source "package/bdwgc/Config.in"
 	source "package/boost/Config.in"
 	source "package/c-capnproto/Config.in"

+ 0 - 37
package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch

@@ -1,37 +0,0 @@
-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)

+ 0 - 19
package/bctoolbox/Config.in

@@ -1,19 +0,0 @@
-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

+ 0 - 3
package/bctoolbox/bctoolbox.hash

@@ -1,3 +0,0 @@
-# Locally calculated
-sha256  446b60e81a79b11e8212c44e312aeb0ce46e9ecf0269a35c492ecdca3e7428c3  bctoolbox-4.4.8.tar.gz
-sha256  1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68  LICENSE.txt

+ 0 - 42
package/bctoolbox/bctoolbox.mk

@@ -1,42 +0,0 @@
-################################################################################
-#
-# 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))