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
This commit is contained in:
parent
aa7a15b6bb
commit
3536206713
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=226940
@ -6,8 +6,8 @@
|
|||||||
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
|
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
|
||||||
|
|
||||||
LIB= zfs
|
LIB= zfs
|
||||||
DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL}
|
DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM}
|
||||||
LDADD= -lmd -lpthread -lumem -lutil
|
LDADD= -lmd -lpthread -lumem -lutil -lm
|
||||||
|
|
||||||
SRCS= deviceid.c \
|
SRCS= deviceid.c \
|
||||||
fsshare.c \
|
fsshare.c \
|
||||||
|
@ -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/uts/common/sys
|
||||||
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
|
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
|
||||||
|
|
||||||
DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
|
DPADD= ${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
|
||||||
${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
|
${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
|
||||||
LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
|
LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -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/lib/libzpool/common
|
||||||
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/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}
|
${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>
|
.include <bsd.prog.mk>
|
||||||
|
@ -19,8 +19,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
|
|||||||
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
|
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
|
||||||
CFLAGS+= -I${.CURDIR}/../../lib/libumem
|
CFLAGS+= -I${.CURDIR}/../../lib/libumem
|
||||||
|
|
||||||
DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
|
DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
|
||||||
${LIBZFS} ${LIBZPOOL}
|
${LIBZFS} ${LIBZPOOL}
|
||||||
LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
|
LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -18,8 +18,8 @@ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
|
|||||||
CFLAGS+= -I${.CURDIR}/../../lib/libumem
|
CFLAGS+= -I${.CURDIR}/../../lib/libumem
|
||||||
|
|
||||||
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
|
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
|
||||||
${LIBPTHREAD} ${LIBZ} ${LIBAVL}
|
${LIBPTHREAD} ${LIBAVL}
|
||||||
LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
|
LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lavl
|
||||||
|
|
||||||
CSTD= c99
|
CSTD= c99
|
||||||
|
|
||||||
|
@ -23,9 +23,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
|
|||||||
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
|
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
|
||||||
CFLAGS+= -I${.CURDIR}/../../lib/libumem
|
CFLAGS+= -I${.CURDIR}/../../lib/libumem
|
||||||
|
|
||||||
DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
|
DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
|
||||||
${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
|
${LIBUUTIL} ${LIBZFS} ${LIBZPOOL}
|
||||||
LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
|
LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool
|
||||||
|
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
Loading…
Reference in New Issue
Block a user