mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-12-27 13:34:00 +01:00
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
30 lines
971 B
Makefile
30 lines
971 B
Makefile
# $FreeBSD$
|
|
|
|
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/ztest
|
|
|
|
PROG= ztest
|
|
MAN=
|
|
|
|
WARNS?= 0
|
|
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}/cddl/contrib/opensolaris/lib/libnvpair
|
|
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libcmdutils
|
|
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}/sys/cddl/contrib/opensolaris/uts/common
|
|
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
|
|
|
|
LIBADD= geom m nvpair umem zpool pthread avl zfs_core zfs uutil
|
|
|
|
CSTD= c99
|
|
|
|
# Since there are many asserts in this program, it makes no sense to compile
|
|
# it without debugging.
|
|
CFLAGS+= -g -DDEBUG=1
|
|
|
|
.include <bsd.prog.mk>
|