Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build on xenial #863

Merged
merged 1 commit into from
Oct 14, 2019
Merged

Fix build on xenial #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
15 changes: 14 additions & 1 deletion llarp/net/net.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,20 @@
#ifndef ANDROID
#include <ifaddrs.h>
#endif
#include <net/if.h>

// 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 <linux/version.h>
# if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0) && LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
# define _NET_IF_H 1
# include <linux/if.h>
extern "C" unsigned int if_nametoindex (const char *__ifname) __THROW;
# endif
#else
# include <net/if.h>
#endif

#include <net/net_addr.hpp>
Expand Down