From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 2 Feb 2009 17:25:40 +0000 (+0000)
Subject: fix stun compile on avr32, brcm-2.4
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=daa9e489e43fa4adfcbfdc8372edb585dce2bc81

fix stun compile on avr32, brcm-2.4

SVN-Revision: 14364
---

diff --git a/net/stun/Makefile b/net/stun/Makefile
index d30d6fe3aa..86f94bbfe0 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 0000000000..c9a23f167d
--- /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 $@