From 668ce456448d671f30bf98c4d4819a88b0bf9f4e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 17 May 2016 15:00:35 +0200 Subject: [PATCH] boost: remove BR2_PACKAGE_BOOST_ARCH_SUPPORTS option The BR2_PACKAGE_BOOST_ARCH_SUPPORTS option was originally added in commit feeab03fa68a02733ae9382b7d47d9eb0d785188 to be able to disable Boost on broken NIOSII CodeSourcery toolchains. However, since then, the CodeSourcery toolchain has been updated, and once the fenv problem is fixed, this NIOSII toolchain is capable of building Boost. Thanks to this we can completely get rid of the BR2_PACKAGE_BOOST_ARCH_SUPPORTS symbol, from boost itself and from all its reverse dependencies. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/boost/Config.in | 5 ----- package/cc-tool/Config.in | 2 -- package/gnuradio/Config.in | 2 -- package/kodi/Config.in | 1 - package/libftdi/Config.in | 2 -- package/libftdi1/Config.in | 2 -- package/libserial/Config.in | 2 -- package/mpd/Config.in | 2 -- package/pulseview/Config.in | 2 -- package/python-libconfig/Config.in | 2 -- package/thrift/Config.in | 2 -- package/valijson/Config.in | 2 -- package/yaml-cpp/Config.in | 2 -- package/zmqpp/Config.in | 2 -- 14 files changed, 30 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index ed67285a58..4cfd44eb94 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -1,14 +1,9 @@ comment "boost needs a toolchain w/ C++, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR -config BR2_PACKAGE_BOOST_ARCH_SUPPORTS - bool - default y if !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII - 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 f8e4531e26..b2cf97969b 100644 --- a/package/cc-tool/Config.in +++ b/package/cc-tool/Config.in @@ -2,7 +2,6 @@ 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 depends on BR2_USE_WCHAR # boost-filesystem select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_BOOST @@ -19,5 +18,4 @@ config BR2_PACKAGE_CC_TOOL http://sourceforge.net/projects/cctool/ comment "cc-tool needs a toolchain w/ C++, threads, wchar" - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 603532cf0c..b72ece50a8 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -1,6 +1,5 @@ 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 @@ -11,7 +10,6 @@ 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 ff2e75cb2f..391b4d1d37 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS bool default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) \ - && BR2_PACKAGE_BOOST_ARCH_SUPPORTS \ && BR2_TOOLCHAIN_HAS_SYNC_8 comment "kodi needs a uClibc or (e)glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7, host gcc >= 4.6" diff --git a/package/libftdi/Config.in b/package/libftdi/Config.in index 8e02cb914c..beb42d34c5 100644 --- a/package/libftdi/Config.in +++ b/package/libftdi/Config.in @@ -13,14 +13,12 @@ if BR2_PACKAGE_LIBFTDI config BR2_PACKAGE_LIBTFDI_CPP bool "C++ bindings" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on BR2_USE_WCHAR select BR2_PACKAGE_BOOST help C++ bindings for libftdi comment "libftdi C++ bindings need a toolchain w/ wchar, C++" - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP endif # BR2_PACKAGE_LIBFTDI diff --git a/package/libftdi1/Config.in b/package/libftdi1/Config.in index 61d4c1cf20..aca797b62a 100644 --- a/package/libftdi1/Config.in +++ b/package/libftdi1/Config.in @@ -14,14 +14,12 @@ config BR2_PACKAGE_LIBFTDI1_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 depends on BR2_USE_WCHAR # boost help C++ bindings for libftdi comment "libftdipp1 needs a toolchain w/ C++, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS config BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS bool "python bindings" diff --git a/package/libserial/Config.in b/package/libserial/Config.in index df5d1b5432..bd936b93b8 100644 --- a/package/libserial/Config.in +++ b/package/libserial/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBSERIAL bool "libserial" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS # boost depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_USE_WCHAR # boost select BR2_PACKAGE_BOOST @@ -12,5 +11,4 @@ config BR2_PACKAGE_LIBSERIAL http://libserial.sourceforge.net/ comment "libserial needs a toolchain w/ C++, threads, wchar" - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 3ac806f74a..4525a21869 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -5,7 +5,6 @@ menuconfig BR2_PACKAGE_MPD depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBGLIB2 @@ -312,7 +311,6 @@ endif comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.6" depends on BR2_USE_MMU - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 diff --git a/package/pulseview/Config.in b/package/pulseview/Config.in index bbbfd7672e..46abe78f76 100644 --- a/package/pulseview/Config.in +++ b/package/pulseview/Config.in @@ -15,7 +15,6 @@ 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 # libsigrok depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 help @@ -27,6 +26,5 @@ config BR2_PACKAGE_PULSEVIEW comment "pulseview needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_PACKAGE_QT5 - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !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 b49aa268a8..7cc5f8a3cd 100644 --- a/package/python-libconfig/Config.in +++ b/package/python-libconfig/Config.in @@ -1,5 +1,4 @@ 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 @@ -9,7 +8,6 @@ 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 54ca9b8538..0ee3f000d7 100644 --- a/package/thrift/Config.in +++ b/package/thrift/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_THRIFT depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_OPENSSL @@ -19,6 +18,5 @@ config BR2_PACKAGE_THRIFT http://thrift.apache.org/ comment "thrift needs a toolchain w/ C++, wchar, threads" - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/valijson/Config.in b/package/valijson/Config.in index 57dad66187..46993783a7 100644 --- a/package/valijson/Config.in +++ b/package/valijson/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_VALIJSON depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_REGEX help @@ -16,5 +15,4 @@ config BR2_PACKAGE_VALIJSON https://github.com/tristanpenman/valijson comment "valijson needs a toolchain w/ C++, threads, wchar support" - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/yaml-cpp/Config.in b/package/yaml-cpp/Config.in index 3cfb955a5f..c1ba410a6b 100644 --- a/package/yaml-cpp/Config.in +++ b/package/yaml-cpp/Config.in @@ -2,7 +2,6 @@ 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 depends on BR2_USE_WCHAR # boost select BR2_PACKAGE_BOOST help @@ -12,5 +11,4 @@ config BR2_PACKAGE_YAML_CPP https://code.google.com/p/yaml-cpp/ comment "yaml-cpp needs a toolchain w/ C++, threads, wchar" - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in index 602425fc88..67e89b379e 100644 --- a/package/zmqpp/Config.in +++ b/package/zmqpp/Config.in @@ -24,7 +24,6 @@ config BR2_PACKAGE_ZMQPP_CLIENT bool "zmqpp client" depends on !BR2_STATIC_LIBS 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 @@ -32,7 +31,6 @@ config BR2_PACKAGE_ZMQPP_CLIENT used to listen or send to zeromq sockets. comment "zmqpp client needs a toolchain w/ dynamic library, threads" - depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS endif -- 2.30.2