From 66215faa5237e3704d55ff171537468079dda9c4 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Tue, 27 Sep 2022 10:05:49 +0200 Subject: [PATCH] package/volk: needs C++17, not boost Since volk 2.5.1, C++17 is required, and no Boost component is used anymore. Signed-off-by: Gwenhael Goavec-Merou [yann.morin.1998@free.fr: split out to its own patch] Signed-off-by: Yann E. MORIN --- package/volk/Config.in | 9 ++------- package/volk/volk.mk | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/package/volk/Config.in b/package/volk/Config.in index 95b4a8bdb5..83d58d64ab 100644 --- a/package/volk/Config.in +++ b/package/volk/Config.in @@ -1,20 +1,15 @@ comment "volk needs a toolchain w/ C++, NPTL, wchar, dynamic library" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS config BR2_PACKAGE_VOLK bool "volk" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # use fork() - depends on BR2_USE_WCHAR # boost - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_FILESYSTEM - select BR2_PACKAGE_BOOST_SYSTEM help VOLK is the Vector-Optimized Library of Kernels. It is a library that contains kernels of hand-written SIMD code diff --git a/package/volk/volk.mk b/package/volk/volk.mk index e7b004b87f..1b36ea69c8 100644 --- a/package/volk/volk.mk +++ b/package/volk/volk.mk @@ -15,7 +15,7 @@ VOLK_LICENSE_FILES = COPYING COPYING-LGPL VOLK_SUPPORTS_IN_SOURCE_BUILD = NO # host-python-mako are needed for volk to compile -VOLK_DEPENDENCIES = host-python3 host-python-mako boost +VOLK_DEPENDENCIES = host-python3 host-python-mako VOLK_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \