svn commit: r285139 - in head: lib/libnv sys/conf sys/contrib/libnv sys/kern sys/sys

[Larry Rosenman]

On 2015-07-09 15:31, Baptiste Daroussin wrote:
> 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
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=201356

has a patch

-- 
Larry Rosenman                     http://www.lerctr.org/~ler
Phone: +1 214-642-9640                 E-Mail: ler at lerctr.org
US Mail: 108 Turvey Cove, Hutto, TX 78634-5688