Author: delphij
Date: Fri Oct 3 20:36:09 2014
New Revision: 272484
URL: https://svnweb.freebsd.org/changeset/base/272484
Log:
Add dependencies to various libraries to libzfs and libzpool.
Submitted by: sef
Modified:
head/Makefile.inc1
head/cddl/lib/libzfs/Makefile
head/cddl/lib/libzpool/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- 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= ${_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
+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
@@ -1580,9 +1584,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: head/cddl/lib/libzfs/Makefile
==============================================================================
--- head/cddl/lib/libzfs/Makefile Fri Oct 3 20:34:55 2014
(r272483)
+++ head/cddl/lib/libzfs/Makefile Fri Oct 3 20:36:09 2014
(r272484)
@@ -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: head/cddl/lib/libzpool/Makefile
==============================================================================
--- head/cddl/lib/libzpool/Makefile Fri Oct 3 20:34:55 2014
(r272483)
+++ head/cddl/lib/libzpool/Makefile Fri Oct 3 20:36:09 2014
(r272484)
@@ -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.
MK_PROFILE= no
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
