-STABLE build appears broken after ipfilter 3.4.35 MFC

[Ruslan Ermilov]

On Sun, Jul 04, 2004 at 07:07:47AM -0700, David Wolfskill wrote:
> [I sent a copy of this information under separate cover to Darren Reed
> a little while ago.  dhw]
> 
> Near the end of a "make buildworld" after the commit I see:
> 
> >>> Rebuilding the temporary build tree
> >>> stage 1: bootstrap tools
> >>> stage 2: rebuilding the object tree
> >>> stage 2: build tools
> >>> stage 3: cross tools
> >>> stage 4: populating /usr/obj/usr/src/i386/usr/include
> >>> stage 4: building libraries
> >>> stage 4: make dependencies
> >>> stage 4: building everything..
> ...
> ===> usr.sbin/ipftest
> cc -O -pipe  -DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DIPFILTER_LOG -I- -I/usr/obj/usr/src/usr.sbin/ipftest -I/usr/src/usr.sbin/ipftest/../../sys/contrib/ipfilter -I/usr/src/usr.sbin/ipftest/../../sys -I/usr/src/usr.sbin/ipftest/../../contrib/ipfilter    -c /usr/src/usr.sbin/ipftest/../../contrib/ipfilter/fil.c
> /usr/src/usr.sbin/ipftest/../../contrib/ipfilter/fil.c:196: conflicting types for `fr_makefrip'
> /usr/src/usr.sbin/ipftest/../../sys/contrib/ipfilter/netinet/ip_fil.h:633: previous declaration of `fr_makefrip'
> *** Error code 1
> 
> Stop in /usr/src/usr.sbin/ipftest.
> *** Error code 1
> 
I don't know what's wrong at your side, but this definitely compiles
correctly here (I have a daily -STABLE buildworld running, and it
doesn't indicate the problem.  Looking at the files/lines the above
mentions, I see that fr_makefrip() is declared identically in both
places.  Could it be that you have some local changes to one of
these files?


Cheers,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20040704/b2afc9a7/attachment.bin