Module Name: src
Committed By: pooka
Date: Wed Apr 22 19:43:45 UTC 2015
Modified Files:
src/share/mk: bsd.README bsd.own.mk
Log Message:
Build ZFS by default only for amd64, not i386.
If we build i386 for 486 (i.e. no 64bit atomic ops) and as a substitute
for the modern hardware that the code was designed to run on use solid
workarounds like external/cddl/osnet/lib/libzpool/atomic.c, there's not
much point in anything.
To generate a diff of this commit:
cvs rdiff -u -r1.339 -r1.340 src/share/mk/bsd.README
cvs rdiff -u -r1.845 -r1.846 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.339 src/share/mk/bsd.README:1.340
--- src/share/mk/bsd.README:1.339 Tue Mar 17 01:58:29 2015
+++ src/share/mk/bsd.README Wed Apr 22 19:43:45 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.339 2015/03/17 01:58:29 mrg Exp $
+# $NetBSD: bsd.README,v 1.340 2015/04/22 19:43:45 pooka Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -423,8 +423,9 @@ MKYP If "no", disables building of YP (
MKZFS If "no", do not build and install utilities and libraries
used to manage ZFS file system. Do not build zfs and solaris
- compatibility kernel modules.
- Default: yes on i386/amd64, no elsewhere.
+ compatibility kernel modules. Note: ZFS requires 64bit
+ atomic operations.
+ Default: yes on amd64, no elsewhere.
MKRUMP If "no", do not build and install rump related headers,
libraries, and programs.
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.845 src/share/mk/bsd.own.mk:1.846
--- src/share/mk/bsd.own.mk:1.845 Wed Apr 8 06:03:09 2015
+++ src/share/mk/bsd.own.mk Wed Apr 22 19:43:45 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.845 2015/04/08 06:03:09 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.846 2015/04/22 19:43:45 pooka Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -945,9 +945,9 @@ MKBINUTILS?= ${MKBFD}
.endif
#
-# We want to build zfs only for i386 and amd64 by default for now.
+# We want to build zfs only for amd64 by default for now.
#
-.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.if ${MACHINE} == "amd64"
MKZFS?= yes
.endif
