Date: Fri, 3 Oct 2014 13:52:49 -0700 From: Garrett Cooper <yaneurabeya@gmail.com> To: Xin LI <delphij@FreeBSD.org> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r272484 - in head: . cddl/lib/libzfs cddl/lib/libzpool Message-ID: <B4EF9CA6-E124-438F-9A08-577D2F3BD5F8@gmail.com> In-Reply-To: <201410032036.s93KaAjb075845@svn.freebsd.org> References: <201410032036.s93KaAjb075845@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On Oct 3, 2014, at 13:36, Xin LI <delphij@FreeBSD.org> wrote: >=20 > Author: delphij > Date: Fri Oct 3 20:36:09 2014 > New Revision: 272484 > URL: https://svnweb.freebsd.org/changeset/base/272484 >=20 > Log: > Add dependencies to various libraries to libzfs and libzpool. >=20 > Submitted by: sef >=20 > Modified: > head/Makefile.inc1 > head/cddl/lib/libzfs/Makefile > head/cddl/lib/libzpool/Makefile >=20 > Modified: head/Makefile.inc1 > =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=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/Makefile.inc1 Fri Oct 3 20:34:55 2014 (r272483) > +++ head/Makefile.inc1 Fri Oct 3 20:36:09 2014 (r272484) > @@ -1531,7 +1531,9 @@ _prebuild_libs=3D ${_kerberos5_lib_libasn1 > lib/ncurses/ncurses lib/ncurses/ncursesw \ > lib/libopie lib/libpam ${_lib_libthr} \ > lib/libradius lib/libsbuf lib/libtacplus \ > + lib/libgeom \ > ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ > + ${_cddl_lib_libuutil} \ > ${_cddl_lib_libavl} \ > ${_cddl_lib_libzfs_core} \ > lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ > @@ -1543,6 +1545,8 @@ gnu/lib/libstdc++__L: lib/msun__L > gnu/lib/libsupc++__L: gnu/lib/libstdc++__L > .endif >=20 > +lib/libgeom__L: lib/libexpat__L > + > .if defined(WITH_ATF) || ${MK_TESTS} !=3D "no" > .if !defined(WITH_ATF) > # Ensure that the ATF libraries will be built during make libraries, even > @@ -1580,9 +1584,11 @@ lib/libopie__L lib/libtacplus__L: lib/li > _cddl_lib_libumem=3D cddl/lib/libumem > _cddl_lib_libnvpair=3D cddl/lib/libnvpair > _cddl_lib_libavl=3D cddl/lib/libavl > +_cddl_lib_libuutil=3D cddl/lib/libuutil > _cddl_lib_libzfs_core=3D cddl/lib/libzfs_core > _cddl_lib=3D cddl/lib > cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L > +cddl/lib/libzfs__L: lib/libgeom__L > .endif >=20 > .if ${MK_CRYPT} !=3D "no" Hi Xin! The changes to Makefile.inc1 are only required if MK_ZFS =3D=3D no. Coul= d you please adjust the code to account for that? Thanks! -Garrett=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B4EF9CA6-E124-438F-9A08-577D2F3BD5F8>