diff options
| author | allanjude <allanjude@FreeBSD.org> | 2015-06-23 16:34:43 +0000 |
|---|---|---|
| committer | allanjude <allanjude@FreeBSD.org> | 2015-06-23 16:34:43 +0000 |
| commit | 9bd23fe714d3ec8385435b6f2809f32e03b05c9e (patch) | |
| tree | 909db804318e4c3246f579b31f4b5b0dde53ac21 /usr.sbin | |
| parent | ebd76cdbc6782ba6e1914a7ae8de22c65d2a3045 (diff) | |
| download | FreeBSD-src-9bd23fe714d3ec8385435b6f2809f32e03b05c9e.zip FreeBSD-src-9bd23fe714d3ec8385435b6f2809f32e03b05c9e.tar.gz | |
Switch fstyp build to toggle ZFS support on WITHOUT_ZFS rather than WITHOUT_CDDL
PR: 200976
Approved by: imp
MFC after: 1 week
Sponsored by: ScaleEngine Inc.
Differential Revision: https://reviews.freebsd.org/D2045
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/fstyp/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/fstyp/fstyp.c | 2 | ||||
| -rw-r--r-- | usr.sbin/fstyp/fstyp.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile index 000dced..786fb2a 100644 --- a/usr.sbin/fstyp/Makefile +++ b/usr.sbin/fstyp/Makefile @@ -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 diff --git a/usr.sbin/fstyp/fstyp.c b/usr.sbin/fstyp/fstyp.c index 95218ca..cd0bbf9 100644 --- a/usr.sbin/fstyp/fstyp.c +++ b/usr.sbin/fstyp/fstyp.c @@ -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 } diff --git a/usr.sbin/fstyp/fstyp.h b/usr.sbin/fstyp/fstyp.h index ca778ba..8deba5e 100644 --- a/usr.sbin/fstyp/fstyp.h +++ b/usr.sbin/fstyp/fstyp.h @@ -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 |
