boost: disable on NIOS 2 with broken toolchains

The current NIOS 2 toolchains are not capable of building Boost, so
let's disable it and its reverse dependencies. Even though it's not
strictly an architecture dependency, we use the <pkg>_ARCH_SUPPORTS
paradigm for this dependency, since it simplifies a lot handling all
boost reverse dependencies, and is anyway quite similar to an
architecture dependency since we don't display a comment about this
dependency.

Fixes:

  http://autobuild.buildroot.net/results/e119b1ef55c546e0d0598b85c46ceefa5c43d5a6/

[Peter: also update mpd comment]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/boost/Config.in b/package/boost/Config.in
index add7069e335dc84d0d56aaf2992807efa4baf841..0ed8dd2eb1f90e0fe242a4c6413cd4e0404205b5 100644 (file)
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -1,9 +1,15 @@
 comment "boost needs a toolchain w/ C++, threads"
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
+config BR2_PACKAGE_BOOST_ARCH_SUPPORTS
+       bool
+       default y if !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405 && \
+               !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
+
 config BR2_PACKAGE_BOOST
        bool "boost"
        depends on BR2_INSTALL_LIBSTDCPP
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        # Boost could theorically be built with threading=single, but
        # that unfortunately doesn't work. Until someone fixes that,
        # let's depend on threads.

diff --git a/package/cc-tool/Config.in b/package/cc-tool/Config.in
index 5087f4acc631cb614121a2ece61348bb2886078a..be115997a3620f5644093c4bd0dfe23483cad93e 100644 (file)
--- a/package/cc-tool/Config.in
+++ b/package/cc-tool/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_CC_TOOL
        bool "cc-tool"
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        select BR2_PACKAGE_LIBUSB
        select BR2_PACKAGE_BOOST
        select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
@@ -17,4 +18,5 @@ config BR2_PACKAGE_CC_TOOL
          http://sourceforge.net/projects/cctool/
 
 comment "cc-tool needs a toolchain w/ C++, threads"
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
index 752a50b2da0cbfa8595a2b9d20bd9a508ed31dd2..574eab46fd3182b31684f4321f605eac5992e799 100644 (file)
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -1,5 +1,6 @@
 comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library"
        depends on BR2_USE_MMU
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
                !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 
@@ -10,6 +11,7 @@ config BR2_PACKAGE_GNURADIO
        depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
        depends on BR2_USE_MMU # use fork()
        depends on BR2_USE_WCHAR # boost
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        select BR2_PACKAGE_BOOST
        select BR2_PACKAGE_BOOST_DATE_TIME
        select BR2_PACKAGE_BOOST_FILESYSTEM

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 254a1df0cdb3730bbbad2116d97cf6aae61f416d..a4d1aab21405ad864732e59a63a3a5cd2b4bcbdc 100644 (file)
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_KODI_ARCH_SUPPORTS
        bool
-       default y if BR2_arm || BR2_i386 || BR2_x86_64
+       default y if (BR2_arm || BR2_i386 || BR2_x86_64) && BR2_PACKAGE_BOOST_ARCH_SUPPORTS
+
 
 comment "kodi needs a toolchain w/ C++, threads, wchar"
        depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS

diff --git a/package/libftdi1/Config.in b/package/libftdi1/Config.in
index 9fb80aebe110b01ec43b9c58a459657c3ec71b85..e41dd91fae7cbd2f5d77a573dbd6590e6f3f497a 100644 (file)
--- a/package/libftdi1/Config.in
+++ b/package/libftdi1/Config.in
@@ -14,11 +14,13 @@ config BR2_PACKAGE_LIBTFDI1_LIBFTDIPP1
        select BR2_PACKAGE_BOOST
        depends on BR2_INSTALL_LIBSTDCPP # boost
        depends on BR2_TOOLCHAIN_HAS_THREADS # boost
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        help
          C++ bindings for libftdi
 
 comment "libfdtipp1 needs a toolchain w/ C++"
        depends on !BR2_INSTALL_LIBSTDCPP
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
 
 config BR2_PACKAGE_LIBTFDI1_PYTHON_BINDINGS
        bool "python bindings"

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 41a4d541044cf275d62fa2faf93334483eebfff5..b57aa55d3a82a9d81702b1960c74a8e51304ad7a 100644 (file)
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -7,6 +7,7 @@ menuconfig BR2_PACKAGE_MPD
        # sparc & CS powerpc gcc are too old
        depends on !BR2_sparc
        depends on !(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009)
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        select BR2_PACKAGE_BOOST
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
@@ -290,6 +291,7 @@ endif
 
 comment "mpd needs a toolchain w/ C++, threads, wchar"
        depends on BR2_USE_MMU
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        depends on !BR2_sparc
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
                !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/pulseview/Config.in b/package/pulseview/Config.in
index de899af89246d2ddb51ded9f6c352427c1f8e24e..df27cde5dc8a374bb641c698be9936c6ad92c62f 100644 (file)
--- a/package/pulseview/Config.in
+++ b/package/pulseview/Config.in
@@ -15,6 +15,7 @@ config BR2_PACKAGE_PULSEVIEW
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU
        depends on BR2_INSTALL_LIBSTDCPP
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        help
          PulseView is a Qt based logic analyzer, oscilloscope
          and MSO GUI for sigrok.
@@ -24,4 +25,5 @@ config BR2_PACKAGE_PULSEVIEW
 comment "pulseview needs a toolchain w/ wchar, threads, C++"
        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

diff --git a/package/python-libconfig/Config.in b/package/python-libconfig/Config.in
index 7cc5f8a3cdfd6aeebdf14bb0c771c521f9d79f25..b49aa268a8438993a72107f13e2e577022233630 100644 (file)
--- a/package/python-libconfig/Config.in
+++ b/package/python-libconfig/Config.in
@@ -1,4 +1,5 @@
 comment "python-libconfig needs a toolchain w/ C++, threads"
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_PYTHON_LIBCONFIG
@@ -8,6 +9,7 @@ config BR2_PACKAGE_PYTHON_LIBCONFIG
        select BR2_PACKAGE_LIBCONFIG
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        help
          Python bindings to the C++ library libconfig
 

diff --git a/package/thrift/Config.in b/package/thrift/Config.in
index c5c7c16baea75ec9190ce4636c1e858d27c0b9ec..b9960f81c7aca96a43330b0ee2c127d3d9f8be63 100644 (file)
--- a/package/thrift/Config.in
+++ b/package/thrift/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_THRIFT
        depends on BR2_USE_WCHAR
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_ARCH_HAS_ATOMICS
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        select BR2_PACKAGE_BOOST
        select BR2_PACKAGE_LIBEVENT
        select BR2_PACKAGE_OPENSSL
@@ -20,5 +21,6 @@ config BR2_PACKAGE_THRIFT
 
 comment "thrift needs a toolchain w/ C++, wchar, threads"
        depends on BR2_ARCH_HAS_ATOMICS
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        depends on !BR2_USE_WCHAR || \
                !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP

diff --git a/package/yaml-cpp/Config.in b/package/yaml-cpp/Config.in
index 954a944a156f8434f7f9694170645b1577bbe45e..9e00b3df4957d6c081ddf8d6ff0c3b6c43a6c3dc 100644 (file)
--- a/package/yaml-cpp/Config.in
+++ b/package/yaml-cpp/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_YAML_CPP
        bool "yaml-cpp"
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS # boost
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        select BR2_PACKAGE_BOOST
        help
          yaml-cpp is a YAML parser and emitter in C++ matching
@@ -10,4 +11,5 @@ config BR2_PACKAGE_YAML_CPP
          https://code.google.com/p/yaml-cpp/
 
 comment "yaml-cpp needs a toolchain w/ C++, threads"
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in
index f3d10c93339bfeb7002efba9abb3962d9a2592ab..0aaeda36447349865ae8d403abf1e6bb8ec6919d 100644 (file)
--- a/package/zmqpp/Config.in
+++ b/package/zmqpp/Config.in
@@ -26,6 +26,7 @@ if BR2_PACKAGE_ZMQPP
 config BR2_PACKAGE_ZMQPP_CLIENT
        bool "zmqpp client"
        depends on BR2_TOOLCHAIN_HAS_THREADS # boost
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        select BR2_PACKAGE_BOOST
        select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
        help
@@ -33,6 +34,7 @@ config BR2_PACKAGE_ZMQPP_CLIENT
          used to listen or send to zeromq sockets.
 
 comment "zmqpp client needs a toolchain w/ threads"
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
        depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 endif