Date: Tue, 19 May 2009 23:29:24 +0200 From: Dimitry Andric <dimitry@andric.com> To: Dmitry Morozovsky <marck@rinet.ru> Cc: freebsd-stable@freebsd.org Subject: Re: RFT: ZFS MFC Message-ID: <4A1324B4.9080105@andric.com> In-Reply-To: <alpine.BSF.2.00.0905200107250.44708@woozle.rinet.ru> References: <3c1674c90905151702l81c2b88off1d2b2ffed39ca2@mail.gmail.com> <4A11A666.3030407@andric.com> <alpine.BSF.2.00.0905191532370.23397@woozle.rinet.ru> <4A12E929.4040406@andric.com> <alpine.BSF.2.00.0905200009060.44708@woozle.rinet.ru> <4A1317C9.90505@andric.com> <alpine.BSF.2.00.0905200048070.44708@woozle.rinet.ru> <alpine.BSF.2.00.0905200107250.44708@woozle.rinet.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2009-05-19 23:08, Dmitry Morozovsky wrote: > After cleaning /usr/obj and buildworld in single thread I got > > /usr/src/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/acl.h:35: > error: conflicting types for 'aclent_t' > /usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/sys/acl.h:43: > error: previous declaration of 'aclent_t' was here You probably didn't use -E with patch, the following files can be removed manually afterwards: sys/cddl/compat/opensolaris/sys/acl.h sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c sys/cddl/contrib/opensolaris/uts/common/sys/vfs.h sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c My copy is currently still buildworlding, and hasn't failed yet...
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A1324B4.9080105>