Fri Apr 26 18:21:25 2024 UTC (13d)
PR/58202: Malte Dehling: Don't link libzfs


(christos)
diff -r1.14 -r1.15 src/usr.sbin/fstyp/Makefile
cvs diff -r1.14 -r1.15 src/usr.sbin/fstyp/Makefile (expand / switch to unified diff)

--- src/usr.sbin/fstyp/Makefile 2023/06/03 21:26:29 1.14
+++ src/usr.sbin/fstyp/Makefile 2024/04/26 18:21:25 1.15
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.14 2023/06/03 21:26:29 lukem Exp $ 1# $NetBSD: Makefile,v 1.15 2024/04/26 18:21:25 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= fstyp 5PROG= fstyp
6SRCS= apfs.c cd9660.c exfat.c ext2fs.c fstyp.c hammer.c hammer2.c hfsplus.c msdosfs.c ntfs.c ufs.c 6SRCS= apfs.c cd9660.c exfat.c ext2fs.c fstyp.c hammer.c hammer2.c hfsplus.c msdosfs.c ntfs.c ufs.c
7 7
8.if (${MKZFS} != "no") 8.if (${MKZFS} != "no")
9SRCS+= zfs.c 9SRCS+= zfs.c
10.endif 10.endif
11 11
12MAN= fstyp.8 12MAN= fstyp.8
13 13
14WARNS?= 6 14WARNS?= 6
15 15
16.if (${MKZFS} != "no") 16.if (${MKZFS} != "no")
17COPTS.zfs.c+= -Wno-unknown-pragmas 17COPTS.zfs.c+= -Wno-unknown-pragmas
18COPTS.zfs.c+= -Wno-sign-conversion 18COPTS.zfs.c+= -Wno-sign-conversion
19COPTS.zfs.c+= -Wno-strict-prototypes 19COPTS.zfs.c+= -Wno-strict-prototypes
20LDADD+= -lnvpair -lzfs 20LDADD+= -lnvpair
 21DPADD+= ${LIBNVPAIR}
21 22
22OSNET=${NETBSDSRCDIR}/external/cddl/osnet 23OSNET=${NETBSDSRCDIR}/external/cddl/osnet
23CPPFLAGS+= -DHAVE_ZFS 24CPPFLAGS+= -DHAVE_ZFS
24CPPFLAGS.zfs.c+= -I${NETBSDSRCDIR}/external 25CPPFLAGS.zfs.c+= -I${NETBSDSRCDIR}/external
25CPPFLAGS.zfs.c+= -I${OSNET}/include 26CPPFLAGS.zfs.c+= -I${OSNET}/include
26CPPFLAGS.zfs.c+= -I${OSNET}/sys 27CPPFLAGS.zfs.c+= -I${OSNET}/sys
27CPPFLAGS.zfs.c+= -I${OSNET}/dist/head 28CPPFLAGS.zfs.c+= -I${OSNET}/dist/head
28CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libzpool/common 29CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libzpool/common
29CPPFLAGS.zfs.c+= -I${OSNET}/dist/uts/common 30CPPFLAGS.zfs.c+= -I${OSNET}/dist/uts/common
30CPPFLAGS.zfs.c+= -I${OSNET}/dist/uts/common/fs/zfs 31CPPFLAGS.zfs.c+= -I${OSNET}/dist/uts/common/fs/zfs
31CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libnvpair 32CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libnvpair
32.endif 33.endif
33 34