Re: [current tinderbox] failure on i386/i386

On 2004-12-25 00:26, Giorgos Keramidas <keramida_at_ceid.upatras.gr> wrote:
> On 2004-12-24 17:11, FreeBSD Tinderbox <tinderbox_at_freebsd.org> wrote:
> > >>> stage 3.2: building everything
> > [...]
> > /tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.h:501:1: warning: "PFIL_HOOKS" redefined
> > <command line>:6:1: warning: this is the location of the previous definition
> > /tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c: In function `fr_forgetifp':
> > /tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c:922: error: `ipf_mutex' undeclared (first use in this function)
> > /tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c:922: error: (Each undeclared identifier is reported only once
> > /tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c:922: error: for each function it appears in.)
> > /tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c: In function `ipfr_fastroute':
> > /tinderbox/CURRENT/i386/i386/src/sys/modules/ipfilter/../../contrib/ipfilter/netinet/ip_fil.c:1779: error: `ipf_rw' undeclared (first use in this function)
> > *** Error code 1
>
> Apparently, ipf_rw is not defined for FreeBSD builds of `fil.c'.
> The following will probably fix the build (I'm running a test build now):
>
> % gothmog:/usr/src# cvs -q di -u sys/contrib/ipfilter/netinet
> % Index: sys/contrib/ipfilter/netinet/fil.c
> % ===================================================================
> % RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/fil.c,v
> % retrieving revision 1.40
> % diff -u -r1.40 fil.c
> % --- sys/contrib/ipfilter/netinet/fil.c  16 Dec 2004 21:02:15 -0000      1.40
> % +++ sys/contrib/ipfilter/netinet/fil.c  24 Dec 2004 22:19:19 -0000
> % _at__at_ -115,10 +115,10 _at__at_
> %  # define       FR_VERBOSE(verb_pr)
> %  # define       FR_DEBUG(verb_pr)
> %  # define       IPLLOG(a, c, d, e)              ipflog(a, c, d, e)
> % -# if SOLARIS || defined(__sgi)
> % +# if SOLARIS || defined(__sgi) || defined(__FreeBSD_version)
> %  extern KRWLOCK_T       ipf_mutex, ipf_auth, ipf_nat;
> %  extern kmutex_t        ipf_rw;
> % -# endif /* SOLARIS || __sgi */
> % +# endif /* SOLARIS || __sgi || __FreeBSD_version */
> %  #endif /* _KERNEL */
> %
> %
> % gothmog:/usr/src#

I sent this message too hastily.  The full fix for the buildkernel
problems of today's CURRENT is a bit longer:

%%%
gothmog:/usr/src# cvs -q di -u sys/contrib/ipfilter
Index: sys/contrib/ipfilter/netinet/fil.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/fil.c,v
retrieving revision 1.40
diff -u -r1.40 fil.c
--- sys/contrib/ipfilter/netinet/fil.c	16 Dec 2004 21:02:15 -0000	1.40
+++ sys/contrib/ipfilter/netinet/fil.c	24 Dec 2004 22:49:58 -0000
_at__at_ -115,10 +115,10 _at__at_
 # define	FR_VERBOSE(verb_pr)
 # define	FR_DEBUG(verb_pr)
 # define	IPLLOG(a, c, d, e)		ipflog(a, c, d, e)
-# if SOLARIS || defined(__sgi)
+# if SOLARIS || defined(__sgi) || (__FreeBSD_version >= 500043)
 extern	KRWLOCK_T	ipf_mutex, ipf_auth, ipf_nat;
 extern	kmutex_t	ipf_rw;
-# endif /* SOLARIS || __sgi */
+# endif /* SOLARIS || __sgi || __FreeBSD_version */
 #endif /* _KERNEL */
 
 
Index: sys/contrib/ipfilter/netinet/ip_fil.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/ip_fil.c,v
retrieving revision 1.49
diff -u -r1.49 ip_fil.c
--- sys/contrib/ipfilter/netinet/ip_fil.c	29 Sep 2004 04:54:32 -0000	1.49
+++ sys/contrib/ipfilter/netinet/ip_fil.c	24 Dec 2004 22:49:49 -0000
_at__at_ -171,6 +171,9 _at__at_
 extern	int		tcp_mtudisc;
 extern	kmutex_t        ipf_rw;
 extern	KRWLOCK_T	ipf_mutex;
+# elif (__FreeBSD_version >= 500043)
+extern	kmutex_t        ipf_rw;
+extern	KRWLOCK_T	ipf_mutex;
 # endif
 #else
 void	init_ifp __P((void));
gothmog:/usr/src#
%%%