From owner-freebsd-current@FreeBSD.ORG Fri Dec 24 22:26:08 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E93A216A4D1; Fri, 24 Dec 2004 22:26:08 +0000 (GMT) Received: from aiolos.otenet.gr (aiolos.otenet.gr [195.170.0.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAC0C43D39; Fri, 24 Dec 2004 22:26:06 +0000 (GMT) (envelope-from keramida@ceid.upatras.gr) Received: from gothmog.gr (patr530-a130.otenet.gr [212.205.215.130]) iBOMQ2hU017704; Sat, 25 Dec 2004 00:26:04 +0200 Received: from gothmog.gr (gothmog [127.0.0.1]) by gothmog.gr (8.13.1/8.13.1) with ESMTP id iBOMQ1e1051419; Sat, 25 Dec 2004 00:26:01 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Received: (from giorgos@localhost) by gothmog.gr (8.13.1/8.13.1/Submit) id iBOMQ1xk051415; Sat, 25 Dec 2004 00:26:01 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Date: Sat, 25 Dec 2004 00:26:01 +0200 From: Giorgos Keramidas To: FreeBSD Tinderbox Message-ID: <20041224222601.GB39539@gothmog.gr> References: <20041224221120.EBB087306E@freebsd-current.sentex.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20041224221120.EBB087306E@freebsd-current.sentex.ca> X-Mailman-Approved-At: Sat, 25 Dec 2004 17:35:12 +0000 cc: current@freebsd.org cc: i386@freebsd.org Subject: Re: [current tinderbox] failure on i386/i386 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Dec 2004 22:26:09 -0000 On 2004-12-24 17:11, FreeBSD Tinderbox 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 > :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 % @@ -115,10 +115,10 @@ % # 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#