diff --git a/CMakeLists.txt b/CMakeLists.txt index dd9567a1d..86b8f389c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,4 @@ -# Lowest version - android ndk 3.6.0 -cmake_minimum_required(VERSION 3.6.0) +cmake_minimum_required(VERSION 3.5.1) # xenial's cmake version find_program(CCACHE_PROGRAM ccache) if(CCACHE_PROGRAM) diff --git a/llarp/net/net.cpp b/llarp/net/net.cpp index bb7c0738f..4d8485cff 100644 --- a/llarp/net/net.cpp +++ b/llarp/net/net.cpp @@ -9,7 +9,20 @@ #ifndef ANDROID #include #endif -#include + +// Work around for broken glibc/linux header definitions in xenial that makes +// including both net/if.h (which we need for if_nametoindex) and linux/if.h +// (which tuntap.h includes) impossible. When we stop supporting xenial we can +// remove this mess and just include net/if.h here. +#if defined(Linux) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 23 +# include +# if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0) && LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0) +# define _NET_IF_H 1 +# include +extern "C" unsigned int if_nametoindex (const char *__ifname) __THROW; +# endif +#else +# include #endif #include