Date: Fri, 21 May 2021 15:35:46 GMT From: Robert Wing <rew@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 942e69146ea2 - stable/13 - fstyp(8): define HAVE_ZFS macro when built with zfs Message-ID: <202105211535.14LFZkPV063949@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=942e69146ea242e94d1e5486c5d04a96c91e2bd3 commit 942e69146ea242e94d1e5486c5d04a96c91e2bd3 Author: Robert Wing <rew@FreeBSD.org> AuthorDate: 2021-05-12 02:57:24 +0000 Commit: Robert Wing <rew@FreeBSD.org> CommitDate: 2021-05-21 15:21:00 +0000 fstyp(8): define HAVE_ZFS macro when built with zfs The HAVE_ZFS macro was dropped from the Makefile during the OpenZFS merge, bring it back. While here, drop unused WARNS setting. PR: 255616 Reported by: Michael Büker <freebsd@michael-bueker.de> Submitted by: Michael Büker <freebsd@michael-bueker.de> Fixes: 9e5787d2284e187abb5b654d924394a65772e004 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D30221 (cherry picked from commit 91f251b2ab3ade5de703756873142bfae2573753) --- usr.sbin/fstyp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile index bfdc845bba4a..14b5d9dfd9c3 100644 --- a/usr.sbin/fstyp/Makefile +++ b/usr.sbin/fstyp/Makefile @@ -28,7 +28,7 @@ SUBDIR.${MK_TESTS}+= tests .if ${MK_ZFS} != "no" IGNORE_PRAGMA= YES -WARNS?= 0 +CFLAGS+= -DHAVE_ZFS CFLAGS.zfs.c+= -DIN_BASE CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105211535.14LFZkPV063949>