diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-08-04 20:00:37 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-08-05 12:11:20 +0200 |
| commit | e01c6f08b7b1e6e9ee203eab21c33152542315f4 (patch) | |
| tree | cf11448b87721efed9a46c7a39168f1d39f6e7d4 | |
| parent | 45aaa372b03f8a96837c0ca4d24a63ca1b218417 (diff) | |
| download | buildroot-e01c6f08b7b1e6e9ee203eab21c33152542315f4.tar.gz buildroot-e01c6f08b7b1e6e9ee203eab21c33152542315f4.zip | |
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>
| -rw-r--r-- | package/libsigrok/Config.in | 11 | ||||
| -rw-r--r-- | package/pulseview/Config.in | 9 | ||||
| -rw-r--r-- | package/sigrok-cli/Config.in | 6 |
3 files changed, 11 insertions, 15 deletions
diff --git a/package/libsigrok/Config.in b/package/libsigrok/Config.in index 8bd7d99fd1..6ef37768f6 100644 --- 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 2fb844baef..e6ddc211e4 100644 --- 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 4e7f137185..b8eb60d1ba 100644 --- 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 |
