From d05fa7b3bdde2b2c34747778a4d15e8c16575cfe Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Aug 2022 13:43:43 +0200 Subject: [PATCH] package/zeek: needs C++17 zeek needs C++17 since its addition in commit ea36681572255ec906167308c07adc42ed2ac9f9 resulting in the following build failure: CMake Error at auxil/bifcl/cmake/RequireCXX17.cmake:46 (message): GCC version must be at least 7.0 for C++17 support, detected: 6.3.0 Fixes: - http://autobuild.buildroot.org/results/4d11e8bea1f7ed0b04cd7e123ed2f352e7a9e77f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zeek/Config.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/zeek/Config.in b/package/zeek/Config.in index f2a769621f..114ec4235d 100644 --- a/package/zeek/Config.in +++ b/package/zeek/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_ZEEK depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_HOST_GCC_AT_LEAST_7 # host-zeek select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL @@ -33,7 +35,9 @@ config BR2_PACKAGE_ZEEK_ZEEKCTL endif -comment "zeek needs a toolchain w/ C++, wchar, threads, dynamic library" +comment "zeek needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 7" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_HOST_GCC_AT_LEAST_7