libsigrok: depends on gcc >= 4.7

Until recently, only the C++ bindings of libsigrok needed a recent
compiler because they are written in C++11. However, now, libsigrok
itself is written in C11, which is only available since gcc 4.7.

So, this commit replaces the CodeSourcery-specific exclusions by a
proper dependency on gcc >= 4.7.

The sigrok-cli and pulseview packages, which select libsigrok, are
also updated accordingly.

Fixes:
  http://autobuild.buildroot.org/results/1d7/1d75497009f1e3b06236b3409fd768dcf7956b87/
  http://autobuild.buildroot.org/results/563/563378e3f6320980153c8c972ceba5e913fe933f/

[Thomas: add autobuilder references, as suggested by Yann E. Morin.]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/package/libsigrok/Config.in b/package/libsigrok/Config.in
index 8bd7d99fd198bad6b69e48863ca19d696234ce7d..6ef37768f6d6168e9e62ee098c76c297a0b99efc 100644 (file)
--- a/package/libsigrok/Config.in
+++ b/package/libsigrok/Config.in
@@ -6,6 +6,8 @@ config BR2_PACKAGE_LIBSIGROK
        depends on BR2_USE_WCHAR
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU
+       # std=c11
+       depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
        help
          Libsigrok is a shared library written in C, which provides
          the basic hardware access drivers for logic analyzers and
@@ -22,20 +24,15 @@ config BR2_PACKAGE_LIBSIGROKCXX
        bool "build C++ bindings"
        select BR2_PACKAGE_GLIBMM
        depends on BR2_INSTALL_LIBSTDCPP
-       # CS powerpc g++ are too old. libsigrokcxx needs C++11
-       depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 && \
-               !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
        help
          Build libsigrok C++ bindings as well.
 
 comment "C++ bindings need a toolchain w/ C++"
        depends on BR2_PACKAGE_LIBSIGROK
        depends on !BR2_INSTALL_LIBSTDCPP
-       depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 && \
-               !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 
 endif
 
-comment "libsigrok needs a toolchain w/ wchar, threads"
+comment "libsigrok needs a toolchain w/ wchar, threads, gcc >= 4.7"
        depends on BR2_USE_MMU
-       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7

diff --git a/package/pulseview/Config.in b/package/pulseview/Config.in
index 2fb844baefde788f0cb5b8ee699e707756f47d4c..e6ddc211e45e419576e17154c158c878e1a8bcdb 100644 (file)
--- a/package/pulseview/Config.in
+++ b/package/pulseview/Config.in
@@ -17,18 +17,15 @@ config BR2_PACKAGE_PULSEVIEW
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        # libsigrok
-       depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 && \
-               !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
+       depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
        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/ wchar, threads, C++"
+comment "pulseview needs a toolchain w/ wchar, threads, C++, gcc >= 4.7"
        depends on BR2_USE_MMU
        depends on BR2_PACKAGE_QT5
        depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
-       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
-       depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 && \
-               !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7

diff --git a/package/sigrok-cli/Config.in b/package/sigrok-cli/Config.in
index 4e7f137185bed857802d23c12bf642fcc3e7d744..b8eb60d1ba9e1a7aff20ce1003ba72ef1777f103 100644 (file)
--- a/package/sigrok-cli/Config.in
+++ b/package/sigrok-cli/Config.in
@@ -5,12 +5,14 @@ config BR2_PACKAGE_SIGROK_CLI
        depends on BR2_USE_WCHAR
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU
+       # libsigrok
+       depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
        help
          Sigrok-cli is a command-line frontend for the sigrok
          software suite.
 
          http://sigrok.org/wiki/Sigrok-cli
 
-comment "sigrok-cli needs a toolchain w/ wchar, threads"
+comment "sigrok-cli needs a toolchain w/ wchar, threads, gcc >= 4.7"
        depends on BR2_USE_MMU
-       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7