From owner-freebsd-i386@FreeBSD.ORG Fri Dec 24 23:07:09 2004 Return-Path: Delivered-To: freebsd-i386@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C60516A4E1; Fri, 24 Dec 2004 23:07:08 +0000 (GMT) Received: from aiolos.otenet.gr (aiolos.otenet.gr [195.170.0.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84FB843D39; Fri, 24 Dec 2004 23:07:06 +0000 (GMT) (envelope-from keramida@linux.gr) Received: from gothmog.gr (patr530-a130.otenet.gr [212.205.215.130]) iBON6sA9023014; Sat, 25 Dec 2004 01:06:58 +0200 Received: from gothmog.gr (gothmog [127.0.0.1]) by gothmog.gr (8.13.1/8.13.1) with ESMTP id iBON6qGO070680; Sat, 25 Dec 2004 01:06:52 +0200 (EET) (envelope-from keramida@linux.gr) Received: (from giorgos@localhost) by gothmog.gr (8.13.1/8.13.1/Submit) id iBON6diO070592; Sat, 25 Dec 2004 01:06:39 +0200 (EET) (envelope-from keramida@linux.gr) Date: Sat, 25 Dec 2004 01:06:39 +0200 From: Giorgos Keramidas To: FreeBSD Tinderbox Message-ID: <20041224230639.GA64800@gothmog.gr> References: <20041224221120.EBB087306E@freebsd-current.sentex.ca> <20041224222601.GB39539@gothmog.gr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20041224222601.GB39539@gothmog.gr> cc: current@freebsd.org cc: i386@freebsd.org Subject: Re: [current tinderbox] failure on i386/i386 X-BeenThere: freebsd-i386@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: I386-specific issues for FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Dec 2004 23:07:09 -0000 On 2004-12-25 00:26, Giorgos Keramidas wrote: > 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# 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 @@ -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) || (__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 @@ -171,6 +171,9 @@ 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# %%%