aboutsummaryrefslogtreecommitdiff
path: root/cddl/sbin
diff options
context:
space:
mode:
authorRobert Millan <rmh@FreeBSD.org>2011-10-30 16:29:04 +0000
committerRobert Millan <rmh@FreeBSD.org>2011-10-30 16:29:04 +0000
commit35362067138d9c7cd61aacfb509f540f7267fe43 (patch)
tree7625c03587487086766b59440120487694119ce9 /cddl/sbin
parentaa7a15b6bb2acf2a1928d5aa06a6e2f00b073aed (diff)
downloadsrc-35362067138d9c7cd61aacfb509f540f7267fe43.tar.gz
src-35362067138d9c7cd61aacfb509f540f7267fe43.zip
Fix a few gratuitous library dependencies. Some of the ZFS utilities
are linked with libraries they don't use: - zinject doesn't use libavl - ztest doesn't use libz - zdb uses neither libavl nor libz - zfs uses neither libbsdxml nor libm, nor libsbuf - zpool uses neither libbsdxml nor libm, nor libsbuf In addition, libzfs needs libm because it uses pow(), however it isn't linked with -lm. This went unnoticed because all its users had -lm before. Reviewed by: pjd, mm Approved by: kib (mentor) MFC after: 1 week
Notes
Notes: svn path=/head/; revision=226940
Diffstat (limited to 'cddl/sbin')
-rw-r--r--cddl/sbin/zfs/Makefile4
-rw-r--r--cddl/sbin/zpool/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index 11f6a0f13c58..4d3c51970567 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -21,8 +21,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
+DPADD= ${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
-LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
+LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs
.include <bsd.prog.mk>
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index f810ee163e07..fba9ebfee604 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -26,8 +26,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
-DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
+DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
-LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
+LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs
.include <bsd.prog.mk>