diff options
author | rodrigc <rodrigc@FreeBSD.org> | 2014-11-29 08:33:54 +0000 |
---|---|---|
committer | rodrigc <rodrigc@FreeBSD.org> | 2014-11-29 08:33:54 +0000 |
commit | 0475e04762f5dd444faf64924251cd3466d84c98 (patch) | |
tree | b01f06f3087a100d6631cac0ff2f01771ce45e54 | |
parent | 0bfa66131535f604deb80bc8d0cf2f8b810f0352 (diff) | |
download | FreeBSD-src-0475e04762f5dd444faf64924251cd3466d84c98.zip FreeBSD-src-0475e04762f5dd444faf64924251cd3466d84c98.tar.gz |
MFC r272484:
Add dependencies to various libraries to libzfs and libzpool.
Submitted by: sef
-rw-r--r-- | Makefile.inc1 | 6 | ||||
-rw-r--r-- | cddl/lib/libzfs/Makefile | 7 | ||||
-rw-r--r-- | cddl/lib/libzpool/Makefile | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 1a13c88..67ecdc2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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/lib/libsupc++ 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/libmd__L _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" diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 4010ac1..b2f4352 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -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 \ diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 848325a..8fe610c 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -56,8 +56,9 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread 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= |