gnunet: drop no-in6_ifreq-redef.patch

This commit is contained in:
Leonid Pliushch 2020-05-01 14:31:45 +03:00
parent 15a76e44d2
commit 5165e81efa
2 changed files with 2 additions and 26 deletions

View File

@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://gnunet.org
TERMUX_PKG_DESCRIPTION="A framework for secure peer-to-peer networking"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=0.12.2
TERMUX_PKG_REVISION=1
TERMUX_PKG_DEPENDS="gnurl, libgcrypt, libgmp, libidn, libjansson, libltdl, libmicrohttpd, libsqlite, libunistring"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_have_decl_struct_in6_ifreq=yes"
@ -28,5 +29,6 @@ termux_step_extract_package() {
}
termux_step_pre_configure() {
CPPFLAGS+=" -D_LINUX_IN6_H"
./bootstrap
}

View File

@ -1,26 +0,0 @@
diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c
index d460326..03beecc 100644
--- a/src/exit/gnunet-helper-exit.c
+++ b/src/exit/gnunet-helper-exit.c
@@ -85,7 +85,7 @@ static const char *sbin_sysctl;
static const char *sbin_iptables;
-#if ! defined(_LINUX_IN6_H) && defined(__linux__)
+#if ! defined(_LINUX_IN6_H) && !defined(__ANDROID__)
/**
* This is in linux/include/net/ipv6.h, but not always exported.
*/
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c
index 4e35fa2..34eb018 100644
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/vpn/gnunet-helper-vpn.c
@@ -59,7 +59,7 @@
*/
#define MAX_SIZE 65536
-#ifndef _LINUX_IN6_H
+#if !defined(_LINUX_IN6_H) && !defined(__ANDROID__)
/**
* This is in linux/include/net/ipv6.h, but not always exported...
*/