Date: Thu, 9 Jul 2015 22:31:55 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Peter Wemm <peter@wemm.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Mariusz Zaborski <oshogbo@freebsd.org> Subject: Re: svn commit: r285139 - in head: lib/libnv sys/conf sys/contrib/libnv sys/kern sys/sys Message-ID: <20150709203154.GB72952@ivaldir.etoilebsd.net> In-Reply-To: <12132227.txsMvZmjyr@overcee.wemm.org> References: <201507041633.t64GXcmT097180@repo.freebsd.org> <12132227.txsMvZmjyr@overcee.wemm.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Thu, Jul 09, 2015 at 01:29:54PM -0700, Peter Wemm wrote: > On Saturday, July 04, 2015 04:33:38 PM Mariusz Zaborski wrote: > > Author: oshogbo > > Date: Sat Jul 4 16:33:37 2015 > > New Revision: 285139 > > URL: https://svnweb.freebsd.org/changeset/base/285139 > > > > Log: > > Move the nvlist source and private includes from sys/kern to seperate > > directory sys/contrib/libnv. > > > > The goal of this operation is to NOT install header files which shouldn't > > be used outside the nvlist library. > > > head/sys/contrib/libnv/nvlist.c > > - copied, changed from r285128, head/sys/kern/subr_nvlist.c > > You have broken kernel builds for the freebsd.org cluster. By renaming > "subr_nvlist.o" to "nvlist.o" you now cause: > > make[2]: ".../Makefile" line 3143: warning: duplicate script for target > "nvpair.o" ignored > make[2]: ".../Makefile" line 1260: warning: using previous script for > "nvpair.o" defined here > > .... > > linking kernel.debug > nvpair.o: In function `illumos_nvlist_add_nvlist': > /usr/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c:1136: multiple > definition of `illumos_nvlist_add_nvlist' > nvpair.o:/usr/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c:1136: > first defined here > nvpair.o: In function `illumos_nvlist_add_nvpair': > /usr/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c:1971: multiple > definition of `illumos_nvlist_add_nvpair' > nvpair.o:/usr/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c:1971: > first defined here > .... > > I'm going to attempt to revert this for the freebsd.org cluster because I need > it to compile for openssl. > You probably want to specify that this happens when zfs is built in the kernel not as a module. Best regards, Bapt [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlWe2joACgkQ8kTtMUmk6Ez2iQCdE3uKI2toK7ElTqCO/Ebg7YVz IAwAoKwK2+NFwuUKGIl73UKwAq4eWBc+ =DBtL -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150709203154.GB72952>