From b3ebe49dabd95cf834e1665117454448cea30009 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 27 May 2019 00:04:01 -0700 Subject: [PATCH 1/2] mcproxy: Fix compilation with uClibc-ng uClibc-ng also defines __GLIBC__, which messes up the check. Signed-off-by: Rosen Penev --- mcproxy/Makefile | 2 +- mcproxy/patches/0003-add-sourcefilter.patch | 2 +- mcproxy/patches/0004-add-defs.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mcproxy/Makefile b/mcproxy/Makefile index ca709c8..ccc4457 100644 --- a/mcproxy/Makefile +++ b/mcproxy/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mcproxy PKG_SOURCE_VERSION:=93b5ace42268160ebbfff4c61818fb15fa2d9b99 PKG_VERSION:=2017-08-24-$(PKG_SOURCE_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/mcproxy/mcproxy.git diff --git a/mcproxy/patches/0003-add-sourcefilter.patch b/mcproxy/patches/0003-add-sourcefilter.patch index 2f64975..6e50263 100644 --- a/mcproxy/patches/0003-add-sourcefilter.patch +++ b/mcproxy/patches/0003-add-sourcefilter.patch @@ -4,7 +4,7 @@ #include #include -+#ifndef __GLIBC__ ++#if !defined(__GLIBC__) || defined(__UCLIBC__) +#include "sourcefilter.cpp" +#endif /* __GLIBC__ */ + diff --git a/mcproxy/patches/0004-add-defs.patch b/mcproxy/patches/0004-add-defs.patch index a1105c9..19feb88 100644 --- a/mcproxy/patches/0004-add-defs.patch +++ b/mcproxy/patches/0004-add-defs.patch @@ -3,7 +3,7 @@ @@ -38,6 +38,8 @@ #include - #ifndef __GLIBC__ + #if !defined(__GLIBC__) || defined(__UCLIBC__) +#define IP_MULTICAST_ALL 49 + #include "sourcefilter.cpp" From ac8fc386fcefbcac1bac9859f208460dcd2df2db Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 27 May 2019 16:48:46 -0700 Subject: [PATCH 2/2] cjdns: Do not build on ARC Is not supported by node. Signed-off-by: Rosen Penev --- cjdns/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cjdns/Makefile b/cjdns/Makefile index cd5ca90..03e9954 100644 --- a/cjdns/Makefile +++ b/cjdns/Makefile @@ -38,7 +38,7 @@ define Package/cjdns TITLE:=Encrypted near-zero-conf mesh routing protocol URL:=https://github.com/cjdelisle/cjdns MAINTAINER:=Lars Gierth - DEPENDS:=@IPV6 +kmod-tun +libnl-tiny +libpthread +librt \ + DEPENDS:=@!arc @IPV6 +kmod-tun +libnl-tiny +libpthread +librt \ +libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2 endef