[src/trunk]: src/external/cddl/osnet Fix zfs Makefiles + debug, don't add -g ...

[haad <haad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/376c4367ccab
branches:  trunk
changeset: 760829:376c4367ccab
user:      haad <haad%NetBSD.org@localhost>
date:      Thu Jan 13 23:18:23 2011 +0000

description:
Fix zfs Makefiles + debug, don't add -g by default only when MKDEBUG is
enabled. Fix header assert conflicts + bump WARNS for some libs.

diffstat:

 external/cddl/osnet/Makefile.zfs           |  7 ++++---
 external/cddl/osnet/lib/libavl/Makefile    |  4 +++-
 external/cddl/osnet/lib/libnvpair/Makefile |  4 +++-
 external/cddl/osnet/lib/libuutil/Makefile  |  4 +++-
 external/cddl/osnet/lib/libzfs/Makefile    |  5 +++--
 5 files changed, 16 insertions(+), 8 deletions(-)

diffs (89 lines):

diff -r ad73511d2d4b -r 376c4367ccab external/cddl/osnet/Makefile.zfs
--- a/external/cddl/osnet/Makefile.zfs  Thu Jan 13 22:30:09 2011 +0000
+++ b/external/cddl/osnet/Makefile.zfs  Thu Jan 13 23:18:23 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.zfs,v 1.2 2010/02/28 15:24:04 haad Exp $
+#      $NetBSD: Makefile.zfs,v 1.3 2011/01/13 23:18:23 haad Exp $
 
 .include <bsd.own.mk>
 
@@ -14,8 +14,9 @@
 CPPFLAGS+=     -D_SUNOS_VTOC_16
 CPPFLAGS+=     -D_PROPLIB_ZFS_CONFLICT
 
-CPPFLAGS+=     -g
-LDFLAGS+=      -g
+CFLAGS+=        -O0 -fno-inline
+
+DBG=   -g
 
 ZFSDIR=                ${NETBSDSRCDIR}/external/cddl/osnet
 
diff -r ad73511d2d4b -r 376c4367ccab external/cddl/osnet/lib/libavl/Makefile
--- a/external/cddl/osnet/lib/libavl/Makefile   Thu Jan 13 22:30:09 2011 +0000
+++ b/external/cddl/osnet/lib/libavl/Makefile   Thu Jan 13 23:18:23 2011 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.3 2010/02/21 01:46:35 darran Exp $
+#      $NetBSD: Makefile,v 1.4 2011/01/13 23:18:24 haad Exp $
 
 .PATH: ${.CURDIR}/../../dist/common/avl
 
+CPPFLAGS+=-Wall -Wno-unknown-pragmas
+
 LIB=   avl
 SRCS=  avl.c
 
diff -r ad73511d2d4b -r 376c4367ccab external/cddl/osnet/lib/libnvpair/Makefile
--- a/external/cddl/osnet/lib/libnvpair/Makefile        Thu Jan 13 22:30:09 2011 +0000
+++ b/external/cddl/osnet/lib/libnvpair/Makefile        Thu Jan 13 23:18:23 2011 +0000
@@ -1,8 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2010/02/22 20:05:03 haad Exp $
+#      $NetBSD: Makefile,v 1.6 2011/01/13 23:18:24 haad Exp $
 
 .PATH:  ${.CURDIR}/../../dist/lib/libnvpair
 .PATH:  ${.CURDIR}/../../dist/common/nvpair
 
+CPPFLAGS+=-Wall -Wno-unknown-pragmas
+
 LIB=   nvpair
 
 SRCS=  libnvpair.c nvpair_alloc_system.c nvpair_alloc_fixed.c nvpair.c
diff -r ad73511d2d4b -r 376c4367ccab external/cddl/osnet/lib/libuutil/Makefile
--- a/external/cddl/osnet/lib/libuutil/Makefile Thu Jan 13 22:30:09 2011 +0000
+++ b/external/cddl/osnet/lib/libuutil/Makefile Thu Jan 13 23:18:23 2011 +0000
@@ -1,8 +1,10 @@
-#      $NetBSD: Makefile,v 1.3 2010/02/21 01:46:35 darran Exp $
+#      $NetBSD: Makefile,v 1.4 2011/01/13 23:18:24 haad Exp $
 
 .PATH: ${.CURDIR}/../../dist/lib/libuutil/common
 .PATH: ${.CURDIR}/../../dist/common/avl
 
+CPPFLAGS+=-Wall -Wno-unknown-pragmas
+
 LIB=   uutil
 SRCS=  avl.c uu_alloc.c uu_avl.c uu_dprintf.c uu_ident.c uu_list.c \
        uu_misc.c uu_open.c uu_pname.c uu_strtoint.c
diff -r ad73511d2d4b -r 376c4367ccab external/cddl/osnet/lib/libzfs/Makefile
--- a/external/cddl/osnet/lib/libzfs/Makefile   Thu Jan 13 22:30:09 2011 +0000
+++ b/external/cddl/osnet/lib/libzfs/Makefile   Thu Jan 13 23:18:23 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2010/02/28 22:40:09 haad Exp $
+#      $NetBSD: Makefile,v 1.6 2011/01/13 23:18:24 haad Exp $
 
 .PATH: ${.CURDIR}/../../dist/common/zfs
 .PATH: ${.CURDIR}/../../dist/common/fs/zfs
@@ -19,12 +19,13 @@
 SRCS+= libzfs_status.c libzfs_sendrecv.c
 
 CPPFLAGS+=     -I${NETBSDSRCDIR}/sbin/mount
+# CPPFLAGS+=   -Wall -Wno-unknown-pragmas
 
 # Avoid conflict with libprop
 CPPFLAGS+=     -D_PROPLIB_ZFS_CONFLICT
 
 # Avoid internal header conflicts
-CPPFLAGS+=     -D_ZFS_CONTEXT_NO_VERIFY
+CPPFLAGS+=     -D_ZFS_CONTEXT_NO_VERIFY -D_ZFS_CONTEXT_NO_DEBUG
 
 .include "../../Makefile.zfs"
 .include <bsd.lib.mk>