Date: Sat, 29 Nov 2014 08:33:55 +0000 (UTC) From: Craig Rodrigues <rodrigc@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r275236 - in stable/10: . cddl/lib/libzfs cddl/lib/libzpool Message-ID: <201411290833.sAT8XtMi053382@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rodrigc Date: Sat Nov 29 08:33:54 2014 New Revision: 275236 URL: https://svnweb.freebsd.org/changeset/base/275236 Log: MFC r272484: Add dependencies to various libraries to libzfs and libzpool. Submitted by: sef Modified: stable/10/Makefile.inc1 stable/10/cddl/lib/libzfs/Makefile stable/10/cddl/lib/libzpool/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/Makefile.inc1 ============================================================================== --- stable/10/Makefile.inc1 Sat Nov 29 07:41:02 2014 (r275235) +++ stable/10/Makefile.inc1 Sat Nov 29 08:33:54 2014 (r275236) @@ -1516,7 +1516,9 @@ _prebuild_libs= ${_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_libypclnt} lib/libz lib/msun \ @@ -1528,6 +1530,8 @@ _prebuild_libs+= gnu/lib/libstdc++ gnu/l gnu/lib/libstdc++__L: lib/msun__L .endif +lib/libgeom__L: lib/libexpat__L + .if defined(WITH_ATF) || ${MK_TESTS} != "no" .if !defined(WITH_ATF) # Ensure that the ATF libraries will be built during make libraries, even @@ -1558,9 +1562,11 @@ lib/libopie__L lib/libtacplus__L: lib/li _cddl_lib_libumem= cddl/lib/libumem _cddl_lib_libnvpair= cddl/lib/libnvpair _cddl_lib_libavl= cddl/lib/libavl +_cddl_lib_libuutil= cddl/lib/libuutil _cddl_lib_libzfs_core= cddl/lib/libzfs_core _cddl_lib= cddl/lib cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L +cddl/lib/libzfs__L: lib/libgeom__L .endif .if ${MK_CRYPT} != "no" Modified: stable/10/cddl/lib/libzfs/Makefile ============================================================================== --- stable/10/cddl/lib/libzfs/Makefile Sat Nov 29 07:41:02 2014 (r275235) +++ stable/10/cddl/lib/libzfs/Makefile Sat Nov 29 08:33:54 2014 (r275236) @@ -7,8 +7,11 @@ LIB= zfs DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ - ${LIBAVL} ${LIBZFS_CORE} -LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core + ${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \ + ${LIBNVPAIR} + +LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \ + -lbsdxml -lgeom -lnvpair -lzfs_core SRCS= deviceid.c \ fsshare.c \ Modified: stable/10/cddl/lib/libzpool/Makefile ============================================================================== --- stable/10/cddl/lib/libzpool/Makefile Sat Nov 29 07:41:02 2014 (r275235) +++ stable/10/cddl/lib/libzpool/Makefile Sat Nov 29 08:33:54 2014 (r275236) @@ -56,8 +56,9 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpt CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include -DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} -LDADD= -lmd -lpthread -lz +DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \ + ${LIBAVL} ${LIBUMEM} +LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem # atomic.S doesn't like profiling. NO_PROFILE=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411290833.sAT8XtMi053382>