From 94dae0d30eed499957b3d0c5ad27b3da4ffdc7f7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 6 Nov 2025 21:45:15 +0100 Subject: [PATCH] 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 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 37d3a2dee346267df51627fc31829da47e568b7c) Signed-off-by: Thomas Perale --- .checkpackageignore | 1 - Config.in.legacy | 8 ++++ package/Config.in | 1 - ...1-Fix-Libs.private-flags-for-mbedtls.patch | 37 ---------------- package/bctoolbox/Config.in | 19 --------- package/bctoolbox/bctoolbox.hash | 3 -- package/bctoolbox/bctoolbox.mk | 42 ------------------- 7 files changed, 8 insertions(+), 103 deletions(-) delete mode 100644 package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch delete mode 100644 package/bctoolbox/Config.in delete mode 100644 package/bctoolbox/bctoolbox.hash delete mode 100644 package/bctoolbox/bctoolbox.mk diff --git a/.checkpackageignore b/.checkpackageignore index 93d58e131d..b986e6fce8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -247,7 +247,6 @@ package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch lib_patch package/bc/0003-dc-fix-exit-code-of-q-command.patch lib_patch.Upstream package/bc/0004-no-gen-libmath.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 diff --git a/Config.in.legacy b/Config.in.legacy index 6d243bad6a..81006945a7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2025.02.9" +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 diff --git a/package/Config.in b/package/Config.in index a5053c06db..ec08acebf8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2146,7 +2146,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" diff --git a/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch b/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch deleted file mode 100644 index 342042d59c..0000000000 --- a/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b7f14a800bbdad193f45695bc5b8c5173f3882ba Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -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 -Signed-off-by: Fabrice Fontaine -[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) diff --git a/package/bctoolbox/Config.in b/package/bctoolbox/Config.in deleted file mode 100644 index 1cf2b7e236..0000000000 --- a/package/bctoolbox/Config.in +++ /dev/null @@ -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 diff --git a/package/bctoolbox/bctoolbox.hash b/package/bctoolbox/bctoolbox.hash deleted file mode 100644 index 9b1f9e821d..0000000000 --- a/package/bctoolbox/bctoolbox.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 446b60e81a79b11e8212c44e312aeb0ce46e9ecf0269a35c492ecdca3e7428c3 bctoolbox-4.4.8.tar.gz -sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/bctoolbox/bctoolbox.mk b/package/bctoolbox/bctoolbox.mk deleted file mode 100644 index ac9361026f..0000000000 --- a/package/bctoolbox/bctoolbox.mk +++ /dev/null @@ -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))