d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch fstyp build to toggle ZFS support on WITHOUT_ZFS rather than WITHOUT_CDDL

Browse Source 
PR:		200976
Approved by:	imp
MFC after:	1 week
Sponsored by:	ScaleEngine Inc.
Differential Revision:	https://reviews.freebsd.org/D2045
This commit is contained in:
allanjude 2015-06-23 16:34:43 +00:00
parent ebd76cdbc6
commit 9bd23fe714
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/fstyp/Makefile
View File

@ -5,7 +5,7 @@
PROG= fstyp
SRCS= cd9660.c ext2fs.c fstyp.c geli.c msdosfs.c ntfs.c ufs.c
.if ${MK_CDDL} != "no"
.if ${MK_ZFS} != "no"
SRCS += zfs.c
.endif
@ -13,10 +13,10 @@ MAN= fstyp.8
WARNS?= 0
.if ${MK_CDDL} != "no"
.if ${MK_ZFS} != "no"
IGNORE_PRAGMA= YES
CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_CDDL
CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_ZFS
CFLAGS+= -I${.CURDIR}/../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/lib/libumem
@ -33,7 +33,7 @@ CFLAGS+=-I${.CURDIR}/../../sys
DPADD= ${LIBGEOM} ${LIBMD}
LDADD= -lgeom -lmd
.if ${MK_CDDL} != "no"
.if ${MK_ZFS} != "no"
DPADD += ${LIBNVPAIR} ${LIBZFS}
LDADD += -lnvpair -lzfs
.endif

2
usr.sbin/fstyp/fstyp.c
View File

@ -63,7 +63,7 @@ static struct {
{ "msdosfs", &fstyp_msdosfs, false },
{ "ntfs", &fstyp_ntfs, false },
{ "ufs", &fstyp_ufs, false },
#ifdef HAVE_CDDL
#ifdef HAVE_ZFS
{ "zfs", &fstyp_zfs, true },
#endif
{ NULL, NULL, NULL }

2
usr.sbin/fstyp/fstyp.h
View File

@ -44,7 +44,7 @@ int fstyp_geli(FILE *fp, char *label, size_t size);
int fstyp_msdosfs(FILE *fp, char *label, size_t size);
int fstyp_ntfs(FILE *fp, char *label, size_t size);
int fstyp_ufs(FILE *fp, char *label, size_t size);
#ifdef HAVE_CDDL
#ifdef HAVE_ZFS
int fstyp_zfs(FILE *fp, char *label, size_t size);
#endif