From bfe5a8ed22654e44d6ca203484ce52bccb0ea254 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 2 Feb 2009 17:25:40 +0000
Subject: [PATCH] fix stun compile on avr32, brcm-2.4

git-svn-id: svn://svn.openwrt.org/openwrt/packages@14364 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/stun/Makefile                        |  2 +-
 net/stun/patches/002-linking_order.patch | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 net/stun/patches/002-linking_order.patch

diff --git a/net/stun/Makefile b/net/stun/Makefile
index d30d6fe3a..86f94bbfe 100644
--- a/net/stun/Makefile
+++ b/net/stun/Makefile
@@ -60,7 +60,7 @@ define Build/Compile
 		CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
 		CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
 		LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -L$(TOOLCHAIN_DIR)/usr/lib \
-			-nodefaultlibs -luClibc++ -lgcc" \
+			-nodefaultlibs -luClibc++ $(LIBGCC_S)" \
 		all
 endef
 
diff --git a/net/stun/patches/002-linking_order.patch b/net/stun/patches/002-linking_order.patch
new file mode 100644
index 000000000..c9a23f167
--- /dev/null
+++ b/net/stun/patches/002-linking_order.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -37,13 +37,13 @@
+ 			 $(addprefix stund/, $(TARS))
+ 
+ server: server.o stun.o udp.o 
+-	$(CXX) $(LDFLAGS) -o $@  $^
++	$(CXX) -o $@ $^ $(LDFLAGS)
+ 
+ tlsServer: tlsServer.o stun.o udp.o
+-	$(CXX) $(LDFLAGS) -o $@  $^
++	$(CXX) -o $@  $^ $(LDFLAGS)
+ 
+ client: client.o stun.o udp.o 
+-	$(CXX) $(LDFLAGS) -o $@  $^
++	$(CXX) -o $@  $^ $(LDFLAGS)
+ 
+ %.o:%.cxx
+ 	$(CXX)  -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@