Module Name: src
Committed By: haad
Date: Thu Jan 13 23:18:24 UTC 2011
Modified Files:
src/external/cddl/osnet: Makefile.zfs
src/external/cddl/osnet/lib/libavl: Makefile
src/external/cddl/osnet/lib/libnvpair: Makefile
src/external/cddl/osnet/lib/libuutil: Makefile
src/external/cddl/osnet/lib/libzfs: Makefile
Log Message:
Fix zfs Makefiles + debug, don't add -g by default only when MKDEBUG is
enabled. Fix header assert conflicts + bump WARNS for some libs.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/Makefile.zfs
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/lib/libavl/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/libnvpair/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/lib/libuutil/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/libzfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/Makefile.zfs
diff -u src/external/cddl/osnet/Makefile.zfs:1.2 src/external/cddl/osnet/Makefile.zfs:1.3
--- src/external/cddl/osnet/Makefile.zfs:1.2 Sun Feb 28 15:24:04 2010
+++ src/external/cddl/osnet/Makefile.zfs Thu Jan 13 23:18:23 2011
@@ -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
Index: src/external/cddl/osnet/lib/libavl/Makefile
diff -u src/external/cddl/osnet/lib/libavl/Makefile:1.3 src/external/cddl/osnet/lib/libavl/Makefile:1.4
--- src/external/cddl/osnet/lib/libavl/Makefile:1.3 Sun Feb 21 01:46:35 2010
+++ src/external/cddl/osnet/lib/libavl/Makefile Thu Jan 13 23:18:24 2011
@@ -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
Index: src/external/cddl/osnet/lib/libnvpair/Makefile
diff -u src/external/cddl/osnet/lib/libnvpair/Makefile:1.5 src/external/cddl/osnet/lib/libnvpair/Makefile:1.6
--- src/external/cddl/osnet/lib/libnvpair/Makefile:1.5 Mon Feb 22 20:05:03 2010
+++ src/external/cddl/osnet/lib/libnvpair/Makefile Thu Jan 13 23:18:24 2011
@@ -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
Index: src/external/cddl/osnet/lib/libuutil/Makefile
diff -u src/external/cddl/osnet/lib/libuutil/Makefile:1.3 src/external/cddl/osnet/lib/libuutil/Makefile:1.4
--- src/external/cddl/osnet/lib/libuutil/Makefile:1.3 Sun Feb 21 01:46:35 2010
+++ src/external/cddl/osnet/lib/libuutil/Makefile Thu Jan 13 23:18:24 2011
@@ -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
Index: src/external/cddl/osnet/lib/libzfs/Makefile
diff -u src/external/cddl/osnet/lib/libzfs/Makefile:1.5 src/external/cddl/osnet/lib/libzfs/Makefile:1.6
--- src/external/cddl/osnet/lib/libzfs/Makefile:1.5 Sun Feb 28 22:40:09 2010
+++ src/external/cddl/osnet/lib/libzfs/Makefile Thu Jan 13 23:18:24 2011
@@ -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>
