Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
mcproxy: fix build with musl
This commit is contained in:
Steven Barth 2015-06-18 10:29:26 +02:00
commit 7f79a8ca39
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mcproxy/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mcproxy PKG_NAME:=mcproxy
PKG_SOURCE_VERSION:=b7bd2d0809a0d1f177181c361b9a6c83e193b79a PKG_SOURCE_VERSION:=b7bd2d0809a0d1f177181c361b9a6c83e193b79a
PKG_VERSION:=2014-12-31-$(PKG_SOURCE_VERSION) PKG_VERSION:=2014-12-31-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://github.com/mcproxy/mcproxy.git PKG_SOURCE_URL:=git://github.com/mcproxy/mcproxy.git

0
mcproxy/patches/0002-uclibc-rm-stoi.patch → mcproxy/patches/0002-rm-stoi.patch
View file

4
mcproxy/patches/0003-uclibc-add-sourcefilter.patch → mcproxy/patches/0003-add-sourcefilter.patch
View file

@ -4,9 +4,9 @@
#include <numeric> #include <numeric>
#include <unistd.h> #include <unistd.h>
+#ifdef __UCLIBC__ +#ifndef __GLIBC__
+#include "sourcefilter.cpp" +#include "sourcefilter.cpp"
+#endif /* __UCLIBC__ */ +#endif /* __GLIBC__ */
+ +
std::string ipAddrResolver(std::string ipAddr) std::string ipAddrResolver(std::string ipAddr)
{ {

4
mcproxy/patches/0004-uclibc-add-defs.patch → mcproxy/patches/0004-add-defs.patch
View file

@ -3,9 +3,9 @@
@@ -38,6 +38,8 @@ @@ -38,6 +38,8 @@
#include <unistd.h> #include <unistd.h>
#ifdef __UCLIBC__ #ifndef __GLIBC__
+#define IP_MULTICAST_ALL 49 +#define IP_MULTICAST_ALL 49
+ +
#include "sourcefilter.cpp" #include "sourcefilter.cpp"
#endif /* __UCLIBC__ */ #endif /* __GLIBC__ */