Merge pull request #2472 from abuibrahim/master

vpnc: revert part of musl patch
This commit is contained in:
Enno Boland 2015-09-08 15:45:01 +02:00
commit 98bd1dfeff
2 changed files with 5 additions and 4 deletions

View file

@ -2,12 +2,13 @@ diff --git sysdep.c sysdep.c
index ff07753..43fdb74 100644 index ff07753..43fdb74 100644
--- sysdep.c --- sysdep.c
+++ sysdep.c +++ sysdep.c
@@ -59,7 +59,7 @@ @@ -59,7 +59,9 @@
#if defined(__DragonFly__) #if defined(__DragonFly__)
#include <net/tun/if_tun.h> #include <net/tun/if_tun.h>
#elif defined(__linux__) #elif defined(__linux__)
-#include <linux/if_tun.h> +#ifdef __GLIBC__
+/*#include <linux/if_tun.h>*/ #include <linux/if_tun.h>
+#endif
#elif defined(__APPLE__) #elif defined(__APPLE__)
/* no header for tun */ /* no header for tun */
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)

View file

@ -1,7 +1,7 @@
# Template file for 'vpnc' # Template file for 'vpnc'
pkgname=vpnc pkgname=vpnc
version=0.5.3 version=0.5.3
revision=4 revision=5
hostmakedepends="perl" hostmakedepends="perl"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=' vpnc' hostmakedepends+=' vpnc'