From 5dc0c5b5a5d8b47aebe392186cf9afcdfc1d221f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 24 Jan 2017 13:34:57 +0000 Subject: [PATCH] tuntap: Do not build on non-Linux platforms. Ideally this would be replaced with similar functionality elsewhere, but for now this change fixes the FTBFS on Debian hurd-* and kfreebsd-*. --- Makefile | 6 +++++- debian/changelog | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b457d71..74fc544 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ -SUBDIRS= base adns hbytes cdb crypto dgram tuntap +SUBDIRS= base adns hbytes cdb crypto dgram + +ifneq ($(wildcard /usr/include/linux/if_tun.h),) +SUBDIRS+= tuntap +endif ifneq ($(wildcard /usr/include/wiringPi.h /usr/include/arm-*/wiringPi.h),) SUBDIRS+= wiringpi diff --git a/debian/changelog b/debian/changelog index d1e1646..62d951a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ chiark-tcl (1.1.4~~iwj) UNRELEASED; urgency=low * wiringpi module. Built only if the wiringpi headers are actually installed (so not in the official Debian release). * Update .gitignore for recent debhelper droppings. + * Do not build tuntap on non-Linux platforms. Ideally this would + be replaced with similar functionality elsewhere, but for now + this change fixes the FTBFS on Debian hurd-* and kfreebsd-*. -- Ian Jackson Tue, 24 Jan 2017 13:14:06 +0000 -- 2.30.2