Fix build on xenial #863
Merged
Fix build on xenial #863
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CMakeLists.txt
Outdated
| @@ -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) | |||
There was a problem hiding this comment.
Can you comment why we need this version? 3.5.1 is :(
There was a problem hiding this comment.
I assume you mean in the code? Added a comment to CMakeLists.txt.
- xenial's cmake version (3.5.1) builds everything fine and test suite passes, so lower the minimum to that. - add a hack for xenial's kernel header & glibc version breaking if both net/if.h and linux/if.h get included. The only thing we actually need from net/if.h that linux/if.h doesn't have is `if_nametoindex`, so just hack that definition in for xenial's specific glibc/kernel header versions.
jagerman
force-pushed
the
xenial-build-fix
branch
from
6a35fea
to
281fbff
Compare
michael-loki
approved these changes
Oct 11, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
xenial's cmake version (3.5.1) builds everything fine and test suite
passes, so lower the minimum to that.
add a hack for xenial's kernel header & glibc version breaking if both
net/if.h and linux/if.h get included. The only thing we actually need
from net/if.h that linux/if.h doesn't have is
if_nametoindex, sojust hack that definition in for xenial's specific glibc/kernel header
versions.
This travis-ci build doesn't hit either of these issues because it isn't fully xenial - it's xenial plus updated headers and cmake versions because WTF travis.