From 914c950df3df6f4436ef43c235d970e009cdd2b1 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 19 May 2015 13:09:57 +0200 Subject: [PATCH] package/libsigrok: blacklist CS powerpc toolchains Even though BR2_PACKAGE_LIBSIGROKCXX is selected, the C++ binding is disabled due to lack of C++11 support in the toolchain. Configure output: Enabled language bindings: - C++............................. no (C++11 compiler required) So disable libsigrok C++ binding and pulseview for CS powerpc toolchains. Fixes: http://autobuild.buildroot.net/results/737/737453011ac0d13ab197258171ffa0f81bc4c368/ [Thomas: use 'depends on !foo && !bar' instead of 'depends on !(foo || bar)', seems it looks more logical in this situation.] Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/libsigrok/Config.in | 5 +++++ package/pulseview/Config.in | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/package/libsigrok/Config.in b/package/libsigrok/Config.in index 93bd06f7b4..8bd7d99fd1 100644 --- a/package/libsigrok/Config.in +++ b/package/libsigrok/Config.in @@ -22,12 +22,17 @@ 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 diff --git a/package/pulseview/Config.in b/package/pulseview/Config.in index df27cde5dc..2fb844baef 100644 --- a/package/pulseview/Config.in +++ b/package/pulseview/Config.in @@ -16,6 +16,9 @@ config BR2_PACKAGE_PULSEVIEW depends on BR2_USE_MMU 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 help PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI for sigrok. @@ -27,3 +30,5 @@ comment "pulseview needs a toolchain w/ wchar, threads, C++" 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 -- 2.30.2