From e38c1006123f54039294348dda51febaa72a3e49 Mon Sep 17 00:00:00 2001
From: Yousong Zhou <yszhou4tech@gmail.com>
Date: Thu, 27 Sep 2018 03:39:12 +0000
Subject: [PATCH] treewide: remove obsolete references to avr32

This is a long overdue followup commit to openwrt/openwrt@5d9eeab
("build: remove obsolete references to cris and avr32")

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---
 lang/jamvm/Makefile                    |  2 +-
 libs/fftw3/Makefile                    |  2 +-
 libs/libdnet/patches/001-compile.patch | 20 --------------------
 libs/libsndfile/Makefile               |  1 -
 net/haproxy/Makefile                   |  6 +-----
 utils/collectd/Makefile                |  6 +-----
 6 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 libs/libdnet/patches/001-compile.patch

diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile
index e074cb3c4f..b6e863d527 100644
--- a/lang/jamvm/Makefile
+++ b/lang/jamvm/Makefile
@@ -30,7 +30,7 @@ define Package/jamvm
   CATEGORY:=Languages
   TITLE:=A compact Java Virtual Machine
   URL:=http://sourceforge.net/projects/jamvm
-  DEPENDS:=+zlib +libpthread +librt +classpath @!avr32
+  DEPENDS:=+zlib +libpthread +librt +classpath
 endef
 
 define Package/jamvm/description
diff --git a/libs/fftw3/Makefile b/libs/fftw3/Makefile
index a05e2d2785..6e23625fda 100644
--- a/libs/fftw3/Makefile
+++ b/libs/fftw3/Makefile
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/fftw3
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=@!avr32 +libpthread
+  DEPENDS:=+libpthread
   VARIANT:=double
   TITLE:=Fast Fourier transform library
   URL:=http://www.fftw.org/
diff --git a/libs/libdnet/patches/001-compile.patch b/libs/libdnet/patches/001-compile.patch
deleted file mode 100644
index 54223c900b..0000000000
--- a/libs/libdnet/patches/001-compile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/config/config.sub
-+++ b/config/config.sub
-@@ -228,7 +228,7 @@ case $basic_machine in
- 	| a29k \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- 	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
- 	| fr30 | frv \
-@@ -290,7 +290,7 @@ case $basic_machine in
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
--	| avr-* \
-+	| avr-* | avr32-* \
- 	| bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
- 	| clipper-* | cydra-* \
diff --git a/libs/libsndfile/Makefile b/libs/libsndfile/Makefile
index 696ef761f2..a7f949810b 100644
--- a/libs/libsndfile/Makefile
+++ b/libs/libsndfile/Makefile
@@ -29,7 +29,6 @@ define Package/libsndfile
   TITLE:=Library for reading/writing audio files
   URL:=http://www.mega-nerd.com/libsndfile/
   MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  DEPENDS:=@!avr32
 endef
 
 define Package/libsndfile/description
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 268501d720..0a0e213f48 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -100,11 +100,7 @@ ifeq ($(CONFIG_TARGET_x86),y)
   ENABLE_REGPARM:=y
 endif
 
-ifeq ($(CONFIG_avr32),y)
-  LINUX_TARGET:=linux26
-else
-  LINUX_TARGET:=linux2628
-endif
+LINUX_TARGET:=linux2628
 
 ifeq ($(BUILD_VARIANT),ssl)
 	ADDON+=USE_OPENSSL=1
diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 7e83795e5e..d734affa13 100644
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -213,10 +213,6 @@ define Package/collectd/config
 	select PACKAGE_collectd-mod-network
 endef
 
-ifneq ($(CONFIG_avr32),)
-  TARGET_CFLAGS += -fsigned-char
-endif
-
 # common configure args
 CONFIGURE_ARGS+= \
 	--disable-werror \
@@ -393,7 +389,7 @@ $(eval $(call BuildPlugin,tail,tail input,tail,))
 $(eval $(call BuildPlugin,tail-csv,tail CSV input,tail_csv,))
 $(eval $(call BuildPlugin,table,table-like structured file input,table,))
 $(eval $(call BuildPlugin,teamspeak2,TeamSpeak2 input,teamspeak2,))
-$(eval $(call BuildPlugin,ted,The Energy Detective input,ted,@((!TARGET_avr32)||BROKEN))) # fails on avr32 because of warnings treated as errors
+$(eval $(call BuildPlugin,ted,The Energy Detective input,ted,))
 $(eval $(call BuildPlugin,tcpconns,TCP connection tracking input,tcpconns,))
 $(eval $(call BuildPlugin,thermal,system temperatures input,thermal,))
 $(eval $(call BuildPlugin,unixsock,unix socket output,unixsock,))