Date: Mon, 25 Apr 2005 18:03:23 -0600 From: Scott Long <scottl@samsco.org> To: Giorgos Keramidas <keramida@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sbin/ipf Makefile Makefile.inc src/sbin/ipf/ipf src/sbin/ipf/ipftestsrc/sbin/ipf/ippool Makefile ... Message-ID: <426D854B.6050801@samsco.org> In-Reply-To: <20050425230258.GA43254@gothmog.gr> References: <200504251855.j3PItq62024205@repoman.freebsd.org> <20050425230258.GA43254@gothmog.gr>
next in thread | previous in thread | raw e-mail | index | archive | help
Darren and Giorgos,
Even if you enable NO_IPFILTER and NO_RESCUE, the built fails in
kdump, apparently due to a nested include problem with ip_fil.h.
There doesn't seem to be an easy way to turn this off either.
Scott
Giorgos Keramidas wrote:
> On 2005-04-25 18:55, Darren Reed <darrenr@freebsd.org> wrote:
>
>>create a new build heirarchy for ipfilter tools
>>
>>Revision Changes Path
>>1.16 +6 -16 src/sbin/ipf/Makefile
>>1.1 +24 -0 src/sbin/ipf/Makefile.inc (new)
>>1.1 +44 -0 src/sbin/ipf/ipf/Makefile (new)
>>[...]
>
>
> Hi Darren,
>
> this breaks the src/rescue/rescue build, because one more level is
> introduced for the IP Filter tools and the ipl.h header cannot be
> located without src/sys/contrib/ipfilter/netinet/ in the include path
> too. The following seems to fix the build of at least src/rescue here,
> at least until the link stage. Then it breaks again because of a
> missing libipf :-(
>
> %%%
> Index: rescue/rescue/Makefile
> ===================================================================
> RCS file: /home/ncvs/src/rescue/rescue/Makefile,v
> retrieving revision 1.42
> diff -u -r1.42 Makefile
> --- rescue/rescue/Makefile 18 Mar 2005 12:55:07 -0000 1.42
> +++ rescue/rescue/Makefile 25 Apr 2005 22:05:19 -0000
> @@ -124,7 +124,8 @@
> .endif
>
> .if !defined(NO_IPFILTER)
> -CRUNCH_PROGS_sbin+= ipf ipfs ipfstat ipmon ipnat
> +CRUNCH_SRCDIRS += sbin/ipf
> +CRUNCH_PROGS_sbin/ipf += ipf ipfs ipfstat ipmon ipnat
> .endif
>
> # crunchgen does not like C++ programs; this should be fixed someday
> Index: sbin/ipf/Makefile.inc
> ===================================================================
> RCS file: /home/ncvs/src/sbin/ipf/Makefile.inc,v
> retrieving revision 1.1
> diff -u -r1.1 Makefile.inc
> --- sbin/ipf/Makefile.inc 25 Apr 2005 18:55:50 -0000 1.1
> +++ sbin/ipf/Makefile.inc 25 Apr 2005 21:57:36 -0000
> @@ -6,6 +6,7 @@
> CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter/tools
> CFLAGS+= -I${.CURDIR}/../../../sys
> CFLAGS+= -I${.CURDIR}/../../../sys/contrib/ipfilter
> +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/ipfilter/netinet
> CFLAGS+= -DSTATETOP -D__UIO_EXPOSE
>
> IPFOBJDIR= ${.OBJDIR}/../libipf
> %%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?426D854B.6050801>