details: https://anonhg.NetBSD.org/src/rev/f26d86d9a795
branches: trunk
changeset: 337660:f26d86d9a795
user: pooka <pooka%NetBSD.org@localhost>
date: Wed Apr 22 19:43:45 2015 +0000
description:
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.
diffstat:
share/mk/bsd.README | 7 ++++---
share/mk/bsd.own.mk | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
diffs (42 lines):
diff -r 279fa3990181 -r f26d86d9a795 share/mk/bsd.README
--- a/share/mk/bsd.README Wed Apr 22 19:25:18 2015 +0000
+++ b/share/mk/bsd.README Wed Apr 22 19:43:45 2015 +0000
@@ -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 @@
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.
diff -r 279fa3990181 -r f26d86d9a795 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Wed Apr 22 19:25:18 2015 +0000
+++ b/share/mk/bsd.own.mk Wed Apr 22 19:43:45 2015 +0000
@@ -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 @@
.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