diff options
author | glebius <glebius@FreeBSD.org> | 2014-02-12 09:59:48 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2014-02-12 09:59:48 +0000 |
commit | 02cb746956a63297f09cf799fffa2fc95119236b (patch) | |
tree | 942bb8147d0bc325ba7cfcd60b4cf1a179d6442b /usr.bin/kdump | |
parent | 25d59f119cec731ecb10ac4b7e740e2e637dba07 (diff) | |
download | FreeBSD-src-02cb746956a63297f09cf799fffa2fc95119236b.zip FreeBSD-src-02cb746956a63297f09cf799fffa2fc95119236b.tar.gz |
Fix world build WITHOUT_PF.
Sponsored by: Nginx, Inc.
Diffstat (limited to 'usr.bin/kdump')
-rw-r--r-- | usr.bin/kdump/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/kdump/mkioctls | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index d65779e..f9d56cc 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -20,6 +20,10 @@ LDADD+= -lcapsicum -lnv CFLAGS+=-DHAVE_LIBCAPSICUM .endif +.if ${MK_PF} != "no" +CFLAGS+=-DPF +.endif + .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" SRCS+= linux_syscalls.c .endif diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls index 0dac684..a9ba860 100644 --- a/usr.bin/kdump/mkioctls +++ b/usr.bin/kdump/mkioctls @@ -21,7 +21,8 @@ LC_ALL=C; export LC_ALL # XXX should we use an ANSI cpp? ioctl_includes=$( cd $includedir - find -H -s * -name '*.h' | grep -v '.*disk.*\.h' | \ + find -H -s * -name '*.h' | \ + egrep -v '(.*disk.*|net/pfvar|net/if_pfsync)\.h' | \ xargs egrep -l \ '^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[ ]+_IO[^a-z0-9_]' | awk '{printf("#include <%s>\\n", $1)}' @@ -54,7 +55,10 @@ BEGIN { print "#include <net/ethernet.h>" print "#include <net/if.h>" print "#include <net/if_var.h>" + print "#ifdef PF" print "#include <net/pfvar.h>" + print "#include <net/if_pfsync.h>" + print "#endif" print "#include <net/route.h>" print "#include <netinet/in.h>" print "#include <netinet/ip_mroute.h>" |