patch: fix detection of epoll.h/sysctl.h for Debian

also look in: $(SYSROOT)/include/$(MACHINE)

Tested successfull on these platforms:

- Debian Testing
- OSX 10.9
- Android NDK r9d
- Ubuntu 13.10
- Mingw32
This commit is contained in:
Alfred E. Heggestad 2014-11-14 11:25:07 +00:00
parent 5e4a7e907d
commit 1391ae6ac7

View file

@ -478,7 +478,9 @@ ifneq ($(HAVE_NET_ROUTE_H),)
CFLAGS += -DHAVE_NET_ROUTE_H
endif
HAVE_SYS_SYSCTL_H := \
$(shell [ -f $(SYSROOT)/include/sys/sysctl.h ] && echo "1")
$(shell [ -f $(SYSROOT)/include/sys/sysctl.h ] || \
[ -f $(SYSROOT)/include/$(MACHINE)/sys/sysctl.h ] \
&& echo "1")
ifneq ($(HAVE_SYS_SYSCTL_H),)
CFLAGS += -DHAVE_SYS_SYSCTL_H
endif
@ -497,7 +499,9 @@ else
HAVE_SYSLOG := $(shell [ -f $(SYSROOT)/include/syslog.h ] && echo "1")
HAVE_DLFCN_H := $(shell [ -f $(SYSROOT)/include/dlfcn.h ] && echo "1")
ifneq ($(OS),darwin)
HAVE_EPOLL := $(shell [ -f $(SYSROOT)/include/sys/epoll.h ] && echo "1")
HAVE_EPOLL := $(shell [ -f $(SYSROOT)/include/sys/epoll.h ] || \
[ -f $(SYSROOT)/include/$(MACHINE)/sys/epoll.h ] \
&& echo "1")
endif
HAVE_LIBRESOLV := $(shell [ -f $(SYSROOT)/include/resolv.h ] && echo "1")