1c05a6ea6b
illumos/illumos-gate@0a0551200e
0a0551200e
https://www.illumos.org/issues/640
du(1), df(1m), ls(1), and swap(1m) all include a copy (it appears literally
copied) of the 'number_to_scaled_string' function in their source. This should
be moved to a shared library and all 4 commands should use this instead.
FreeBSD note: of all libcmdutils functionality ZFS (and other illumos
contrib code) currently uses only nicenum() function (which is similar
to humanize_number but has some formatting differences). For this
reason I decided to not port the whole library. As a result, nicenum.c
from libcmdutils is compiled into libzfs and libzpool. This is a bit
ugly, but works. If one day we are forced to create libillumos, then
the file should be moved to that library.
Reviewed by: Sebastian Wiedenroth <wiedi@frubar.net>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Author: Jason King <jason.brian.king@gmail.com>
MFC after: 2 weeks
63 lines
1.8 KiB
Makefile
63 lines
1.8 KiB
Makefile
# $FreeBSD$
|
|
|
|
.PATH: ${SRCTOP}/cddl/compat/opensolaris/misc
|
|
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
|
|
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
|
|
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
|
|
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libcmdutils/common
|
|
|
|
LIB= zfs
|
|
LIBADD= md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core
|
|
SRCS= deviceid.c \
|
|
fsshare.c \
|
|
mkdirp.c \
|
|
mnttab.c \
|
|
thread_pool.c \
|
|
zmount.c \
|
|
zone.c
|
|
|
|
SRCS+= nicenum.c
|
|
|
|
SRCS+= libzfs_changelist.c \
|
|
libzfs_compat.c \
|
|
libzfs_config.c \
|
|
libzfs_dataset.c \
|
|
libzfs_diff.c \
|
|
libzfs_import.c \
|
|
libzfs_iter.c \
|
|
libzfs_mount.c \
|
|
libzfs_pool.c \
|
|
libzfs_sendrecv.c \
|
|
libzfs_status.c \
|
|
libzfs_util.c \
|
|
zfeature_common.c \
|
|
zfs_comutil.c \
|
|
zfs_deleg.c \
|
|
zfs_fletcher.c \
|
|
zfs_namecheck.c \
|
|
zfs_prop.c \
|
|
zpool_prop.c \
|
|
zprop_common.c \
|
|
|
|
WARNS?= 0
|
|
SHLIB_MAJOR= 3
|
|
CSTD= c99
|
|
CFLAGS+= -DZFS_NO_ACL
|
|
CFLAGS+= -I${SRCTOP}/sbin/mount
|
|
CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
|
|
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
|
|
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
|
|
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
|
|
CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
|
|
CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
|
|
CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
|
|
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
|
|
CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
|
|
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
|
|
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common
|
|
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
|
|
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common
|
|
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libcmdutils
|
|
|
|
.include <bsd.lib.mk>
|