Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix zfs Makefiles + debug, don't add -g by default only when MKDEBUG is

Browse Source 
enabled. Fix header assert conflicts + bump WARNS for some libs.
This commit is contained in:
haad 2011-01-13 23:18:23 +00:00
parent 7532abd112
commit c7287ec04b
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
external/cddl/osnet/Makefile.zfs vendored
View File

@ -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+= -std=c99
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

4
external/cddl/osnet/lib/libavl/Makefile vendored
View File

@ -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

4
external/cddl/osnet/lib/libnvpair/Makefile vendored
View File

@ -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

4
external/cddl/osnet/lib/libuutil/Makefile vendored
View File

@ -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

5
external/cddl/osnet/lib/libzfs/Makefile vendored
View File

@ -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_pool.c libzfs_changelist.c libzfs_config.c libzfs_import.c
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>