Commit c785b1b2 authored by Romain Naour's avatar Romain Naour Committed by Thomas Petazzoni
Browse files

toolchain-external: CodeSourcery NIOSII: support only one version 

See the conclusion about external toolchains during the Buildroot
meeting [1]:
"In the future, we stick to a single external toolchain version. The
Kconfig symbol should not encode the version (avoid legacy handling)"

[1] http://elinux.org/index.php?title=Buildroot:DeveloperDaysELCE2015#Report



Signed-off-by: default avatarRomain Naour <romain.naour@openwide.fr>
Reviewed-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 09f1a3b9

package/aiccu/Config.in

+2 −4
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ config BR2_PACKAGE_AICCU 
	depends on BR2_TOOLCHAIN_HAS_THREADS

	depends on BR2_USE_MMU # fork()

	# Triggers the _gp link issue

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII

	select BR2_PACKAGE_GNUTLS

	help

	  SixXS Automatic IPv6 Connectivity Client Utility
@@ -24,5 +23,4 @@ config BR2_PACKAGE_AICCU 
comment "aiccu needs a toolchain w/ wchar, threads"

	depends on BR2_USE_MMU

	depends on !(BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
 
	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII

package/boost/Config.in

+1 −2
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ comment "boost needs a toolchain w/ C++, threads, wchar" 


config BR2_PACKAGE_BOOST_ARCH_SUPPORTS

	bool

	default y if !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405 && \

		!BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305

	default y if !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII



config BR2_PACKAGE_BOOST

	bool "boost"

package/connman/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ config BR2_PACKAGE_CONNMAN_NEARD 


config BR2_PACKAGE_CONNMAN_OFONO

	bool "enable ofono support"

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405 # libcap-ng

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII # libcap-ng

	select BR2_PACKAGE_OFONO



config BR2_PACKAGE_CONNMAN_DEBUG

package/crda/Config.in

+2 −4
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ config BR2_PACKAGE_CRDA 
	# regdb is a runtime dependency

	select BR2_PACKAGE_WIRELESS_REGDB

	# Triggers the _gp link issue

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII

	help

	  Central Regulatory Domain Agent.
@@ -21,5 +20,4 @@ config BR2_PACKAGE_CRDA 


comment "crda needs a toolchain w/ threads, dynamic library"

	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
 
	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII

package/cryptsetup/Config.in

+2 −4
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ config BR2_PACKAGE_CRYPTSETUP 
	depends on !BR2_STATIC_LIBS # lvm2

	depends on BR2_USE_WCHAR # util-linux

	# Triggers the _gp link issue

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII

	help

	  This tool helps manipulate dm-crypt and luks partitions for

	  on-disk encryption.
@@ -21,5 +20,4 @@ config BR2_PACKAGE_CRYPTSETUP 
comment "cryptsetup needs a toolchain w/ wchar, threads, dynamic library"

	depends on BR2_USE_MMU

	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
 
	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII