Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Jun 2004 22:09:59 +0200
From:      Max Laier <max@love2party.net>
To:        freebsd-current@freebsd.org
Cc:        Kim Culhan <w8hdkim@yahoo.com>
Subject:   Re: -current build failure -not seen on the list
Message-ID:  <200406202209.59939.max@love2party.net>
In-Reply-To: <20040619190814.96149.qmail@web50706.mail.yahoo.com>
References:  <20040619190814.96149.qmail@web50706.mail.yahoo.com>

next in thread | previous in thread | raw e-mail | index | archive | help

--Boundary-03=_X8e1AQKPZ4cjOcr
Content-Type: multipart/mixed;
  boundary="Boundary-01=_X8e1AW4iU+RZ8TF"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--Boundary-01=_X8e1AW4iU+RZ8TF
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

On Saturday 19 June 2004 21:08, Kim Culhan wrote:
> Is anyone seeing this:
>
> contrib/altq -I../../../contrib/ipfilter -I../../../contrib/pf
> -I../../../contrib/dev/ath -I../../../contrib/dev/ath/freebsd
> -I../../../contrib/ngatm -D_KERNEL -include opt_global.h -fno-common
> -finline-limit=3D8000  -mno-align-long-strings
> -mpreferred-stack-boundary=3D2 -ffreestanding -Werror
> ../../../netinet/in_proto.c
> In file included from ../../../netinet/in_proto.c:91:
> ../../../contrib/pf/net/pfvar.h:55: error: redefinition of `union
> sockaddr_union'
> *** Error code 1
>
> Is my build environment hosed ?

No, this is a problem when you add both:
	options	FAST_IPSEC
and	device	pfsync

Attached patch is a quick-fix. I will investigate a more final solution. So=
rry=20
for the delay.

=2D-=20
Best regards,				| mlaier@freebsd.org
Max Laier				| ICQ #67774661
http://pf4freebsd.love2party.net/	| mlaier@EFnet

--Boundary-01=_X8e1AW4iU+RZ8TF
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="sockaddr_union.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="sockaddr_union.diff"

Index: pfvar.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/store/mlaier/fcvs/src/sys/contrib/pf/net/pfvar.h,v
retrieving revision 1.6
diff -u -r1.6 pfvar.h
=2D-- pfvar.h	16 Jun 2004 23:24:00 -0000	1.6
+++ pfvar.h	20 Jun 2004 20:05:41 -0000
@@ -52,11 +52,13 @@
  *  If we include <netipsec/keydb.h>, we need _KERNEL definition.
  *  This makes pfctl compilation difficult.
  */
+#ifndef _NETIPSEC_KEYDB_H_
 union sockaddr_union {
 	struct sockaddr		sa;
 	struct sockaddr_in	sin;
 	struct sockaddr_in6	sin6;
 };
+#endif
 #endif
=20
 #include <netinet/tcp_fsm.h>

--Boundary-01=_X8e1AW4iU+RZ8TF--

--Boundary-03=_X8e1AQKPZ4cjOcr
Content-Type: application/pgp-signature
Content-Description: signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQBA1e8XXyyEoT62BG0RAqvFAJ9HyeyxJ1NfO/EvIiEJy8HPNoudkACfVuzm
OAx0+tNqG9A5K+c1JZvzfH0=
=0eXC
-----END PGP SIGNATURE-----

--Boundary-03=_X8e1AQKPZ4cjOcr--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406202209.59939.max>