aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2014-06-17 19:23:19 -0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-06-18 14:01:03 +0200
commit4ff0323105d1f978c75a1adb73f744a6324369d8 (patch)
treee3ba82706047f21dfd8db0b46adeff86e39ce792
parent5de7f26975975d56a103032e2401ec1e9e032aa8 (diff)
downloadbuildroot-4ff0323105d1f978c75a1adb73f744a6324369d8.tar.gz
buildroot-4ff0323105d1f978c75a1adb73f744a6324369d8.tar.bz2
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: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/libtirpc/Config.in6
-rw-r--r--package/openpgm/Config.in1
-rw-r--r--package/popt/popt.mk2
-rw-r--r--package/rpcbind/Config.in6
-rw-r--r--package/zeromq/Config.in1
-rw-r--r--package/zyre/Config.in6
6 files changed, 7 insertions, 15 deletions
diff --git a/package/libtirpc/Config.in b/package/libtirpc/Config.in
index a6759e70d3..a8e6dd386a 100644
--- a/package/libtirpc/Config.in
+++ b/package/libtirpc/Config.in
@@ -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
diff --git a/package/openpgm/Config.in b/package/openpgm/Config.in
index a9d0cc84dc..dc66367b41 100644
--- a/package/openpgm/Config.in
+++ b/package/openpgm/Config.in
@@ -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
diff --git a/package/popt/popt.mk b/package/popt/popt.mk
index 9f2d070d89..f3ef43f344 100644
--- a/package/popt/popt.mk
+++ b/package/popt/popt.mk
@@ -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
diff --git a/package/rpcbind/Config.in b/package/rpcbind/Config.in
index e02fb950e2..2a79bdc69c 100644
--- a/package/rpcbind/Config.in
+++ b/package/rpcbind/Config.in
@@ -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
diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
index a02f4ab474..778a503e02 100644
--- a/package/zeromq/Config.in
+++ b/package/zeromq/Config.in
@@ -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)
diff --git a/package/zyre/Config.in b/package/zyre/Config.in
index 31e1d6f0ae..fbfc6f940a 100644
--- a/package/zyre/Config.in
+++ b/package/zyre/Config.in
@@ -8,8 +8,7 @@ config BR2_PACKAGE_ZYRE
depends on BR2_USE_MMU # filemq -> czmq
# uClibc toolchains provided by ADI don't have AI_ADDRCONFIG
# support, needed by filemq -> czmq
- depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
- !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
+ depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2
select BR2_PACKAGE_FILEMQ
help
An open-source framework for proximity-based peer-to-peer
@@ -19,7 +18,6 @@ config BR2_PACKAGE_ZYRE
comment "zyre needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
depends on BR2_USE_MMU
- 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_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)