From 898cc963d6320948cb84005caf5695a55d33c2ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Wed, 17 Jun 2015 19:51:26 +0200 Subject: [PATCH] mcproxy: fix build with musl MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- mcproxy/Makefile | 2 +- .../patches/{0002-uclibc-rm-stoi.patch => 0002-rm-stoi.patch} | 0 ...ibc-add-sourcefilter.patch => 0003-add-sourcefilter.patch} | 4 ++-- .../{0004-uclibc-add-defs.patch => 0004-add-defs.patch} | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename mcproxy/patches/{0002-uclibc-rm-stoi.patch => 0002-rm-stoi.patch} (100%) rename mcproxy/patches/{0003-uclibc-add-sourcefilter.patch => 0003-add-sourcefilter.patch} (99%) rename mcproxy/patches/{0004-uclibc-add-defs.patch => 0004-add-defs.patch} (80%) diff --git a/mcproxy/Makefile b/mcproxy/Makefile index be96bc7..c155055 100644 --- 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 diff --git a/mcproxy/patches/0002-uclibc-rm-stoi.patch b/mcproxy/patches/0002-rm-stoi.patch similarity index 100% rename from mcproxy/patches/0002-uclibc-rm-stoi.patch rename to mcproxy/patches/0002-rm-stoi.patch diff --git a/mcproxy/patches/0003-uclibc-add-sourcefilter.patch b/mcproxy/patches/0003-add-sourcefilter.patch similarity index 99% rename from mcproxy/patches/0003-uclibc-add-sourcefilter.patch rename to mcproxy/patches/0003-add-sourcefilter.patch index 7c4e90c..2f64975 100644 --- a/mcproxy/patches/0003-uclibc-add-sourcefilter.patch +++ b/mcproxy/patches/0003-add-sourcefilter.patch @@ -4,9 +4,9 @@ #include #include -+#ifdef __UCLIBC__ ++#ifndef __GLIBC__ +#include "sourcefilter.cpp" -+#endif /* __UCLIBC__ */ ++#endif /* __GLIBC__ */ + std::string ipAddrResolver(std::string ipAddr) { diff --git a/mcproxy/patches/0004-uclibc-add-defs.patch b/mcproxy/patches/0004-add-defs.patch similarity index 80% rename from mcproxy/patches/0004-uclibc-add-defs.patch rename to mcproxy/patches/0004-add-defs.patch index 022cb02..a1105c9 100644 --- a/mcproxy/patches/0004-uclibc-add-defs.patch +++ b/mcproxy/patches/0004-add-defs.patch @@ -3,9 +3,9 @@ @@ -38,6 +38,8 @@ #include - #ifdef __UCLIBC__ + #ifndef __GLIBC__ +#define IP_MULTICAST_ALL 49 + #include "sourcefilter.cpp" - #endif /* __UCLIBC__ */ + #endif /* __GLIBC__ */ -- 2.30.2