Date: Tue, 5 Aug 2014 13:01:22 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269585 - in head: sbin/ipf sys/contrib/ipfilter/netinet Message-ID: <53e0d5a2.5ad6.714bf468@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Aug 5 13:01:21 2014 New Revision: 269585 URL: http://svnweb.freebsd.org/changeset/base/269585 Log: Honour WITH and WITHOUT_INET6_SUPPORT. Approved by: glebius (mentor) MFC after: 3 days Modified: head/sbin/ipf/Makefile.inc head/sys/contrib/ipfilter/netinet/ip_compat.h Modified: head/sbin/ipf/Makefile.inc ============================================================================== --- head/sbin/ipf/Makefile.inc Tue Aug 5 12:08:50 2014 (r269584) +++ head/sbin/ipf/Makefile.inc Tue Aug 5 13:01:21 2014 (r269585) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <src.opts.mk> + WARNS?= 2 NO_WFORMAT= NO_WARRAY_BOUNDS= @@ -10,6 +12,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -I${.CURDIR}/../../../sys/contrib/ipfilter CFLAGS+= -DSTATETOP -D__UIO_EXPOSE +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+= -DUSE_INET6 +.else +CFLAGS+= -DNOINET6 +.endif + LIBIPF= ${.OBJDIR}/../libipf/libipf.a DPADD+= ${LIBIPF} ${LIBKVM} LDADD+= ${LIBIPF} -lkvm Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h ============================================================================== --- head/sys/contrib/ipfilter/netinet/ip_compat.h Tue Aug 5 12:08:50 2014 (r269584) +++ head/sys/contrib/ipfilter/netinet/ip_compat.h Tue Aug 5 13:01:21 2014 (r269585) @@ -118,6 +118,10 @@ struct ether_addr { # if defined(INET6) && !defined(USE_INET6) # define USE_INET6 # endif +# else +# if !defined(USE_INET6) && !defined(NOINET6) +# define USE_INET6 +# endif # endif # if defined(_KERNEL)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e0d5a2.5ad6.714bf468>