Commit 4ff03231 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

blackfin: 2012R1 toolchain is gone, remove kludges 



Remove ADI toolchain 2012R1 package kludges since that version is gone
since the last bump.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 5de7f269

package/libtirpc/Config.in

+2 −4
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ config BR2_PACKAGE_LIBTIRPC 
	# don't need to propagate this dependency to reverse

	# dependencies of libtirpc for which native RPC support can be

	# used instead of libtirpc.

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \

		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2

	depends on BR2_TOOLCHAIN_HAS_THREADS

	help

	  Libtirpc is a port of Sun's Transport-Independent RPC
@@ -15,6 +14,5 @@ config BR2_PACKAGE_LIBTIRPC 
	  http://sourceforge.net/projects/libtirpc/



comment "libtirpc needs a toolchain w/ threads"

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \

		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2

	depends on !BR2_TOOLCHAIN_HAS_THREADS

package/openpgm/Config.in

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ config BR2_PACKAGE_OPENPGM 
	depends on !BR2_avr32

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1

	depends on BR2_TOOLCHAIN_HAS_THREADS

	depends on BR2_INET_IPV6

	depends on BR2_USE_WCHAR

package/popt/popt.mk

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ POPT_CONF_ENV = ac_cv_va_copy=yes 
# The external Blackfin toolchains have <glob.h>, but not all the

# necessary uClibc options for glob functions, so we force disable the

# usage of the glob functions for these toolchains.

ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1),y)

ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1),y)

POPT_CONF_ENV += ac_cv_header_glob_h=no

endif

package/rpcbind/Config.in

+2 −4
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ config BR2_PACKAGE_RPCBIND 
	select BR2_PACKAGE_LIBTIRPC

	# uClibc toolchains provided by ADI don't have AI_ADDRCONFIG

	# support, needed for libtirpc

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \

		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2

	# fork()

	depends on BR2_USE_MMU

	help
@@ -15,7 +14,6 @@ config BR2_PACKAGE_RPCBIND 
	  into universal addresses.



comment "rpcbind needs a toolchain w/ threads"

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \

		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2

	depends on !BR2_TOOLCHAIN_HAS_THREADS

	depends on BR2_USE_MMU

package/zeromq/Config.in

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ config BR2_PACKAGE_ZEROMQ_PGM 
	depends on !BR2_avr32 # openpgm

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1 # openpgm

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 # openpgm

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 # openpgm

	select BR2_PACKAGE_OPENPGM

	help

	  Add support for Pragmatic General Multicast protocol (RFC 3208)