Merge pull request #104 from openwrt-es/mcproxy-next

mcproxy: fix build with musl
2015-06-18 10:29:26 +02:00 · 2015-06-18 10:29:26 +02:00 · 7f79a8ca39
commit 7f79a8ca39
parent 09beed4a4a 898cc963d6
4 changed files with 5 additions and 5 deletions
--- a/mcproxy/Makefile
+++ b/mcproxy/Makefile
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=mcproxy
 PKG_SOURCE_VERSION:=b7bd2d0809a0d1f177181c361b9a6c83e193b79a
 PKG_VERSION:=2014-12-31-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/mcproxy/mcproxy.git
--- a/mcproxy/patches/0002-uclibc-rm-stoi.patch
+++ b/mcproxy/patches/0002-uclibc-rm-stoi.patch
--- a/mcproxy/patches/0003-uclibc-add-sourcefilter.patch
+++ b/mcproxy/patches/0003-uclibc-add-sourcefilter.patch
@ -4,9 +4,9 @@
 #include <numeric>
 #include <unistd.h>
 
-+#ifdef __UCLIBC__
+#ifndef __GLIBC__
 +#include "sourcefilter.cpp"
-+#endif /* __UCLIBC__ */
+#endif /* __GLIBC__ */
 +
 std::string ipAddrResolver(std::string ipAddr)
 {
--- a/mcproxy/patches/0004-uclibc-add-defs.patch
+++ b/mcproxy/patches/0004-uclibc-add-defs.patch
@ -3,9 +3,9 @@
@@ -38,6 +38,8 @@
 #include <unistd.h>
 
- #ifdef __UCLIBC__
+ #ifndef __GLIBC__
 +#define IP_MULTICAST_ALL 49
 +
 #include "sourcefilter.cpp"
- #endif /* __UCLIBC__ */
+ #endif /* __GLIBC__ */