NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libsigrok: depends on gcc >= 4.7

Browse Source 
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>
This commit is contained in:
Thomas Petazzoni 2015-08-04 20:00:37 +02:00
parent 45aaa372b0
commit e01c6f08b7
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/libsigrok/Config.in
View File

@ -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

9
package/pulseview/Config.in
View File

@ -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

6
package/sigrok-cli/Config.in
View File

@ -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