From 6ed7036464541e06b241a5a71d3e39d932410ddc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Jan 2021 12:04:59 +0100 Subject: [PATCH] package/mpd: depends on gcc and host gcc >= 7 mpd uses string_view since version 0.22 and https://github.com/MusicPlayerDaemon/MPD/commit/fa45a8adfa44f6bc815ae7428770112c15c76d73 string_view is a C++17 feature: https://github.com/MusicPlayerDaemon/MPD/commit/e0e5ed62ee98a0e21bc928f432a0051854193cd2 So add a dependency on host gcc >= 7 Moreover, C++17 is also mandatory on the target side since https://github.com/MusicPlayerDaemon/MPD/commit/8f981845dc7376824d94fd24924788c582942929 so also bump the gcc dependency Finally, drop BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is not needed as it will always be true with gcc >= 7 Fixes: - http://autobuild.buildroot.org/results/e42a1d0cd808585a755754f839fe7d2080547191 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/mpd/Config.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index fbde82ab58..b19113d8c0 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -5,8 +5,8 @@ menuconfig BR2_PACKAGE_MPD depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14 - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_HOST_GCC_AT_LEAST_7 # C++17 select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help @@ -405,11 +405,10 @@ config BR2_PACKAGE_MPD_ID3TAG endif -comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 6" +comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 7, host gcc >= 7" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 - -comment "mpd needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_HOST_GCC_AT_LEAST_7 -- 2.30.2