Merge pull request #479 from neheb/master
authorJo-Philipp Wich <jo@mein.io>
Wed, 26 Jun 2019 17:02:51 +0000 (19:02 +0200)
committerGitHub <noreply@github.com>
Wed, 26 Jun 2019 17:02:51 +0000 (19:02 +0200)
Build fixes

cjdns/Makefile
mcproxy/Makefile
mcproxy/patches/0003-add-sourcefilter.patch
mcproxy/patches/0004-add-defs.patch

index cd5ca905574e1780848b6ff0680efb70bd6fae2d..03e995429851baa99a20e6232ef0d6c78b2a40f4 100644 (file)
@@ -38,7 +38,7 @@ define Package/cjdns
        TITLE:=Encrypted near-zero-conf mesh routing protocol
        URL:=https://github.com/cjdelisle/cjdns
        MAINTAINER:=Lars Gierth <larsg@systemli.org>
-       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
 
index ca709c812702954d28eed6f5a0b311037f0dd16f..ccc445777a4cd5bd354e102bd9165853352c7094 100644 (file)
@@ -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
index 2f64975e47ab51f23750b54d10965c46bbc8c522..6e50263ed0c08ebf68202e735b10b197e8eb9c35 100644 (file)
@@ -4,7 +4,7 @@
  #include <numeric>
  #include <unistd.h>
  
-+#ifndef __GLIBC__
++#if !defined(__GLIBC__) || defined(__UCLIBC__)
 +#include "sourcefilter.cpp"
 +#endif /* __GLIBC__ */
 +
index a1105c9c5dc45b5953c1c1c990e35503d5110c97..19feb8864088fb15e6a8f43d603d003e6f257b05 100644 (file)
@@ -3,7 +3,7 @@
 @@ -38,6 +38,8 @@
  #include <unistd.h>
  
- #ifndef __GLIBC__
+ #if !defined(__GLIBC__) || defined(__UCLIBC__)
 +#define IP_MULTICAST_ALL 49
 +
  #include "sourcefilter.cpp"