boost: remove BR2_PACKAGE_BOOST_ARCH_SUPPORTS option
The BR2_PACKAGE_BOOST_ARCH_SUPPORTS option was originally added in
commit feeab03fa6
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 <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
d6966645da
commit
668ce45644
@ -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.
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user