Wed Jun 6 14:47:54 2018 UTC ()
Make cddl/osnet/Makefile.zfs compatible with MKLLVM=yes

Clang/LLVM does not recognize:
 - -Wno-discarded-qualifiers

This is a step forward functional MKLLVM=yes HAVE_LLVM=yes build.

Sponsored by <The NetBSD Foundation>


(kamil)
diff -r1.5 -r1.6 src/external/cddl/osnet/Makefile.zfs
cvs diff -r1.5 -r1.6 src/external/cddl/osnet/Makefile.zfs (expand / switch to unified diff)

--- src/external/cddl/osnet/Makefile.zfs 2018/05/28 21:05:02 1.5
+++ src/external/cddl/osnet/Makefile.zfs 2018/06/06 14:47:54 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.zfs,v 1.5 2018/05/28 21:05:02 chs Exp $ 1# $NetBSD: Makefile.zfs,v 1.6 2018/06/06 14:47:54 kamil Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5# Verify these manually 5# Verify these manually
6NOGCCERROR= yes 6NOGCCERROR= yes
7 7
8# Basic compilation stuff. 8# Basic compilation stuff.
9CPPFLAGS+= -std=c99 9CPPFLAGS+= -std=c99
10 10
11# Pick a VTOC format - ick. 11# Pick a VTOC format - ick.
12CPPFLAGS+= -D_SUNOS_VTOC_16 12CPPFLAGS+= -D_SUNOS_VTOC_16
13CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT 13CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
14 14
@@ -32,26 +32,28 @@ CPPFLAGS+= -I${ZFSDIR}/dist/lib/libdevin @@ -32,26 +32,28 @@ CPPFLAGS+= -I${ZFSDIR}/dist/lib/libdevin
32CPPFLAGS+= -I${ZFSDIR}/dist/lib/libnvpair 32CPPFLAGS+= -I${ZFSDIR}/dist/lib/libnvpair
33CPPFLAGS+= -I${ZFSDIR}/dist/lib/libshare/common 33CPPFLAGS+= -I${ZFSDIR}/dist/lib/libshare/common
34CPPFLAGS+= -I${ZFSDIR}/dist/lib/libumem 34CPPFLAGS+= -I${ZFSDIR}/dist/lib/libumem
35CPPFLAGS+= -I${ZFSDIR}/dist/lib/libuutil/common 35CPPFLAGS+= -I${ZFSDIR}/dist/lib/libuutil/common
36CPPFLAGS+= -I${ZFSDIR}/dist/lib/libzfs/common 36CPPFLAGS+= -I${ZFSDIR}/dist/lib/libzfs/common
37CPPFLAGS+= -I${ZFSDIR}/dist/lib/libzfs_core/common 37CPPFLAGS+= -I${ZFSDIR}/dist/lib/libzfs_core/common
38CPPFLAGS+= -I${ZFSDIR}/dist/lib/libzpool/common 38CPPFLAGS+= -I${ZFSDIR}/dist/lib/libzpool/common
39 39
40CPPFLAGS+= -I${ZFSDIR}/dist/common 40CPPFLAGS+= -I${ZFSDIR}/dist/common
41 41
42CWARNFLAGS+= -Wno-missing-field-initializers 42CWARNFLAGS+= -Wno-missing-field-initializers
43CWARNFLAGS+= -Wno-strict-prototypes 43CWARNFLAGS+= -Wno-strict-prototypes
44CWARNFLAGS+= -Wno-cast-qual 44CWARNFLAGS+= -Wno-cast-qual
 45.if defined(HAVE_LLVM)
45CWARNFLAGS+= -Wno-discarded-qualifiers 46CWARNFLAGS+= -Wno-discarded-qualifiers
 47.endif
46CWARNFLAGS+= -Wno-switch 48CWARNFLAGS+= -Wno-switch
47CWARNFLAGS+= -Wno-missing-prototypes 49CWARNFLAGS+= -Wno-missing-prototypes
48CWARNFLAGS+= -Wno-unused-variable 50CWARNFLAGS+= -Wno-unused-variable
49CWARNFLAGS+= -Wno-shadow 51CWARNFLAGS+= -Wno-shadow
50 52
51LIBAVL_SRCDIR= ${ZFSDIR}/lib/libavl 53LIBAVL_SRCDIR= ${ZFSDIR}/lib/libavl
52LIBNVPAIR_SRCDIR= ${ZFSDIR}/lib/libnvpair 54LIBNVPAIR_SRCDIR= ${ZFSDIR}/lib/libnvpair
53LIBUMEM_SRCDIR= ${ZFSDIR}/lib/libumem 55LIBUMEM_SRCDIR= ${ZFSDIR}/lib/libumem
54LIBUUTIL_SRCDIR= ${ZFSDIR}/lib/libuutil 56LIBUUTIL_SRCDIR= ${ZFSDIR}/lib/libuutil
55LIBZFS_SRCDIR= ${ZFSDIR}/lib/libzfs 57LIBZFS_SRCDIR= ${ZFSDIR}/lib/libzfs
56LIBZFS_CORE_SRCDIR= ${ZFSDIR}/lib/libzfs_core 58LIBZFS_CORE_SRCDIR= ${ZFSDIR}/lib/libzfs_core
57LIBZPOOL_SRCDIR= ${ZFSDIR}/lib/libzpool 59LIBZPOOL_SRCDIR= ${ZFSDIR}/lib/libzpool