CVS commit: src/sys/modules/zfs
Module Name:src
Committed By: christos
Date: Thu Apr 15 17:26:22 UTC 2021
Modified Files:
src/sys/modules/zfs: Makefile.zfsmod
Log Message:
- Don't define NEED_ISYSTEM. This is a rump thing and should be only exposed
there.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/zfs/Makefile.zfsmod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.9 src/sys/modules/zfs/Makefile.zfsmod:1.10
--- src/sys/modules/zfs/Makefile.zfsmod:1.9 Tue Feb 5 04:54:36 2019
+++ src/sys/modules/zfs/Makefile.zfsmod Thu Apr 15 13:26:22 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.9 2019/02/05 09:54:36 hannken Exp $
+# $NetBSD: Makefile.zfsmod,v 1.10 2021/04/15 17:26:22 christos Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -135,5 +135,3 @@ CPPFLAGS+= -I${ZFSDIR}/dist/uts/common/z
CPPFLAGS+= -I${ZFSDIR}/dist/uts/common
CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
-
-NEED_ISYSTEM= # duplicate headers, depends on -isystem to build
CVS commit: src/sys/modules/zfs
Module Name:src
Committed By: christos
Date: Sat Aug 18 11:57:58 UTC 2018
Modified Files:
src/sys/modules/zfs: Makefile.zfsmod
Log Message:
remove NOGCCERROR; hides real issues.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/zfs/Makefile.zfsmod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.7 src/sys/modules/zfs/Makefile.zfsmod:1.8
--- src/sys/modules/zfs/Makefile.zfsmod:1.7 Mon May 28 17:05:01 2018
+++ src/sys/modules/zfs/Makefile.zfsmod Sat Aug 18 07:57:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.7 2018/05/28 21:05:01 chs Exp $
+# $NetBSD: Makefile.zfsmod,v 1.8 2018/08/18 11:57:57 christos Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -118,7 +118,6 @@ SRCS+= zfs_acl.c
SRCS+= zfs_stub.c
WARNS= 0
-NOGCCERROR= yes
CWARNFLAGS+= -Wall
CWARNFLAGS+= -Wno-unknown-pragmas
CVS commit: src/sys/modules/zfs
Module Name:src
Committed By: christos
Date: Sat Jun 18 21:45:05 UTC 2016
Modified Files:
src/sys/modules/zfs: Makefile.zfsmod
Log Message:
avoid duplicate symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/zfs/Makefile.zfsmod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.5 src/sys/modules/zfs/Makefile.zfsmod:1.6
--- src/sys/modules/zfs/Makefile.zfsmod:1.5 Tue Apr 22 11:12:52 2014
+++ src/sys/modules/zfs/Makefile.zfsmod Sat Jun 18 17:45:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.5 2014/04/22 15:12:52 christos Exp $
+# $NetBSD: Makefile.zfsmod,v 1.6 2016/06/18 21:45:05 christos Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -18,7 +18,7 @@ SRCS+= zprop_common.c
.PATH: ${ZFSDIR}/dist/uts/common/zmod
-SRCS+= trees.c
+#SRCS+= trees.c
.PATH: ${ZFSDIR}/lib/libzpool
@@ -93,7 +93,7 @@ SRCS+= zio.c
SRCS+= zio_checksum.c
SRCS+= zio_compress.c
SRCS+= zio_inject.c
-SRCS+= zutil.c
+#SRCS+= zutil.c
SRCS+= zvol.c
SRCS+= zle.c
CVS commit: src/sys/modules/zfs
Module Name:src
Committed By: christos
Date: Tue Apr 22 15:12:52 UTC 2014
Modified Files:
src/sys/modules/zfs: Makefile.zfsmod
Log Message:
add atomic.c
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/zfs/Makefile.zfsmod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.4 src/sys/modules/zfs/Makefile.zfsmod:1.5
--- src/sys/modules/zfs/Makefile.zfsmod:1.4 Wed Nov 21 12:48:05 2012
+++ src/sys/modules/zfs/Makefile.zfsmod Tue Apr 22 11:12:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.4 2012/11/21 17:48:05 pooka Exp $
+# $NetBSD: Makefile.zfsmod,v 1.5 2014/04/22 15:12:52 christos Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -20,6 +20,10 @@ SRCS+= zprop_common.c
SRCS+= trees.c
+.PATH: ${ZFSDIR}/lib/libzpool
+
+SRCS+= atomic.c
+
.PATH: ${ZFSDIR}/dist/uts/common/fs/zfs
SRCS+= arc.c
CVS commit: src/sys/modules/zfs
Module Name:src
Committed By: christos
Date: Sat Feb 4 18:28:53 UTC 2012
Modified Files:
src/sys/modules/zfs: Makefile.zfsmod
Log Message:
Remove -g -O0. It does not work on amd64 at all.
If you want debugging on, add it yourself.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/zfs/Makefile.zfsmod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.1 src/sys/modules/zfs/Makefile.zfsmod:1.2
--- src/sys/modules/zfs/Makefile.zfsmod:1.1 Tue Jan 18 17:21:22 2011
+++ src/sys/modules/zfs/Makefile.zfsmod Sat Feb 4 13:28:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.1 2011/01/18 22:21:22 haad Exp $
+# $NetBSD: Makefile.zfsmod,v 1.2 2012/02/04 18:28:53 christos Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -126,5 +126,5 @@ CPPFLAGS+= -std=c99
CPPFLAGS+= -D_NFS_NFS_H_
CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
-CFLAGS+= -DDIAGNOSTIC -g -O0
+CFLAGS+= -DDIAGNOSTIC
# -DZFS_DEBUG
CVS commit: src/sys/modules/zfs
Module Name:src
Committed By: haad
Date: Mon Aug 10 22:39:38 UTC 2009
Modified Files:
src/sys/modules/zfs: Makefile
Log Message:
Remove strange looking -I entries.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/zfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/zfs/Makefile
diff -u src/sys/modules/zfs/Makefile:1.1 src/sys/modules/zfs/Makefile:1.2
--- src/sys/modules/zfs/Makefile:1.1 Mon Aug 10 07:16:06 2009
+++ src/sys/modules/zfs/Makefile Mon Aug 10 22:39:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/08/10 07:16:06 haad Exp $
+# $NetBSD: Makefile,v 1.2 2009/08/10 22:39:38 haad Exp $
.include "../Makefile.inc"
@@ -112,8 +112,6 @@
CWARNFLAGS+= -Wno-missing-prototypes
CWARNFLAGS+= -Wno-format
-CPPFLAGS+= -I${.CURDIR}/../..
-CPPFLAGS+= -I${.CURDIR}/../../../../include
CPPFLAGS+= -I${ZFSDIR}/sys
CPPFLAGS+= -I${ZFSDIR}/dist/common/acl
CPPFLAGS+= -I${ZFSDIR}/dist/common/zfs
@@ -123,7 +121,7 @@
CPPFLAGS+= -I${ZFSDIR}/dist/uts/common/zfs
CPPFLAGS+= -I${ZFSDIR}/dist/uts/common
-CPPFLAGS+= -Dcaddr_t=__caddr_t "-D__va_list=va_list"
+CPPFLAGS+= -Dcaddr_t=__caddr_t "-D__va_list=va_list" -D__NetBSD__
CPPFLAGS+= -std=c99
CPPFLAGS+= -D_NFS_NFS_H_
CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
