From c4445f33d43c90cb3cd56f59844b9a8cf98ccb2a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 9 Apr 2025 22:03:21 +0200 Subject: [PATCH] package/pulseview: fix, update, and reorganise dependencies The dependencies for pulseview are not entirely clean: - arch deps are not first; - second-level inherited deps are listed; - deps are not alphabetically ordered (for deps on packages); - the comment is hidden even when the arch deps are met, because of an incorrect dependency on Qt5; - qt5 is a depends-on when it could be a select. Update the dependencies to fix all the points above. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 70bcb7655bc1893c76e682cbb7c750b84c70ca64) Signed-off-by: Thomas Perale --- package/pulseview/Config.in | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/package/pulseview/Config.in b/package/pulseview/Config.in index f122551b9f..b1f9dc25d7 100644 --- a/package/pulseview/Config.in +++ b/package/pulseview/Config.in @@ -1,40 +1,40 @@ config BR2_PACKAGE_PULSEVIEW bool "pulseview" - depends on BR2_PACKAGE_QT5 - # libsigrok->libglib2: - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem + depends on BR2_USE_WCHAR # libsigrok, qt5 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 depends on BR2_INSTALL_LIBSTDCPP - # libsigrok->libzip - depends on !BR2_STATIC_LIBS - # libsigrok - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 - depends on BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_ENABLE_LOCALE + depends on !BR2_STATIC_LIBS # libsigrok, qt5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigrok + depends on BR2_HOST_GCC_AT_LEAST_5 # qt5 + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BOOST_SERIALIZATION + select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_LIBSIGROK select BR2_PACKAGE_LIBSIGROKCXX - select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_PNG + select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5SVG select BR2_PACKAGE_QT5TOOLS select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_FILESYSTEM - select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_BOOST_SERIALIZATION help PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI for sigrok. http://sigrok.org/wiki/PulseView -comment "pulseview needs a toolchain w/ locale, wchar, threads, dynamic library, C++, gcc >= 7, host gcc >= 4.9" +comment "pulseview needs a toolchain w/ locale, wchar, threads, dynamic library, C++, gcc >= 7, host gcc >= 5" depends on BR2_USE_MMU - depends on BR2_PACKAGE_QT5 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ - || BR2_STATIC_LIBS || !BR2_ENABLE_LOCALE || \ - !BR2_HOST_GCC_AT_LEAST_4_9 + depends on !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ + || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_ENABLE_LOCALE \ + || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ + || !BR2_HOST_GCC_AT_LEAST_5