From owner-svn-src-head@FreeBSD.ORG Fri Oct 3 20:52:55 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5EBBE31B; Fri, 3 Oct 2014 20:52:55 +0000 (UTC) Received: from mail-pa0-x229.google.com (mail-pa0-x229.google.com [IPv6:2607:f8b0:400e:c03::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 23C475FB; Fri, 3 Oct 2014 20:52:55 +0000 (UTC) Received: by mail-pa0-f41.google.com with SMTP id eu11so2101734pac.14 for ; Fri, 03 Oct 2014 13:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=references:mime-version:in-reply-to:content-type :content-transfer-encoding:message-id:cc:from:subject:date:to; bh=JOhWY9vhmMZrSvqHRRwWcUNVpgMiWLMiX+uncEbEocA=; b=TbNONUvjTW55rCvHuF+QKZn3hSoCCSRyJxqUMJAf5zFzIHptG3VTPXIo9JCbobgzXt 6BfmKvO4d+cfB1OzfgZONn9uyaRXlxpIgTp3NFznMExnnVcHvFzh7oHRdrjM9ScGSFYM NysNL6s/pHCa1YTj7zLk+RfMkKRZSFmgOnchXmn7vQqssW2FlIlFsR3TIqYYIgSMRMHd 39Wdz+ZDF6Uc0W2+QUWg1KKQePxDcorvb3ntPjdutab1rN5xButfAFhIY2Sm1Z/71iht 4qwYNErKdD36fvgz8SXQ9TB46gbYeiFfyKU4M9f6ZdZPtQ4Nmhby3Z37u2oMULCZaKgf JFHA== X-Received: by 10.70.65.7 with SMTP id t7mr2992046pds.133.1412369574713; Fri, 03 Oct 2014 13:52:54 -0700 (PDT) Received: from [10.57.40.208] (mobile-166-137-212-089.mycingular.net. [166.137.212.89]) by mx.google.com with ESMTPSA id gi14sm7189192pbd.10.2014.10.03.13.52.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 Oct 2014 13:52:54 -0700 (PDT) References: <201410032036.s93KaAjb075845@svn.freebsd.org> Mime-Version: 1.0 (1.0) In-Reply-To: <201410032036.s93KaAjb075845@svn.freebsd.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Message-Id: X-Mailer: iPhone Mail (11D257) From: Garrett Cooper Subject: Re: svn commit: r272484 - in head: . cddl/lib/libzfs cddl/lib/libzpool Date: Fri, 3 Oct 2014 13:52:49 -0700 To: Xin LI Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Oct 2014 20:52:55 -0000 > On Oct 3, 2014, at 13:36, Xin LI 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=