Commit feeab03f authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 69964d81

package/boost/Config.in

+6 −0
Original line number Diff line number Diff line 
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.

package/cc-tool/Config.in

+2 −0
Original line number Diff line number Diff line
@@ -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

package/gnuradio/Config.in

+2 −0
Original line number Diff line number Diff line 
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

package/kodi/Config.in

+2 −1
Original line number Diff line number Diff line 
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

package/libftdi1/Config.in

+2 −0
Original line number Diff line number Diff line
@@ -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"