Merge pull request #479 from neheb/master

Build fixes
This commit is contained in:
Jo-Philipp Wich 2019-06-26 19:02:51 +02:00 committed by GitHub
commit 33aab05acd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View file

@ -38,7 +38,7 @@ define Package/cjdns
TITLE:=Encrypted near-zero-conf mesh routing protocol TITLE:=Encrypted near-zero-conf mesh routing protocol
URL:=https://github.com/cjdelisle/cjdns URL:=https://github.com/cjdelisle/cjdns
MAINTAINER:=Lars Gierth <larsg@systemli.org> 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 +libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
endef endef

View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mcproxy PKG_NAME:=mcproxy
PKG_SOURCE_VERSION:=93b5ace42268160ebbfff4c61818fb15fa2d9b99 PKG_SOURCE_VERSION:=93b5ace42268160ebbfff4c61818fb15fa2d9b99
PKG_VERSION:=2017-08-24-$(PKG_SOURCE_VERSION) PKG_VERSION:=2017-08-24-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/mcproxy/mcproxy.git PKG_SOURCE_URL:=https://github.com/mcproxy/mcproxy.git

View file

@ -4,7 +4,7 @@
#include <numeric> #include <numeric>
#include <unistd.h> #include <unistd.h>
+#ifndef __GLIBC__ +#if !defined(__GLIBC__) || defined(__UCLIBC__)
+#include "sourcefilter.cpp" +#include "sourcefilter.cpp"
+#endif /* __GLIBC__ */ +#endif /* __GLIBC__ */
+ +

View file

@ -3,7 +3,7 @@
@@ -38,6 +38,8 @@ @@ -38,6 +38,8 @@
#include <unistd.h> #include <unistd.h>
#ifndef __GLIBC__ #if !defined(__GLIBC__) || defined(__UCLIBC__)
+#define IP_MULTICAST_ALL 49 +#define IP_MULTICAST_ALL 49
+ +
#include "sourcefilter.cpp" #include "sourcefilter.cpp"