Thu Apr 18 16:12:31 2024 UTC (21d)
Pull up following revision(s) (requested by riastradh in ticket #1834):

	share/mk/bsd.own.mk: revision 1.1177

ZFS works fine on my v210, so let's enable it for sparc64


(martin)
diff -r1.1149.2.7 -r1.1149.2.8 src/share/mk/bsd.own.mk
cvs diff -r1.1149.2.7 -r1.1149.2.8 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2024/04/18 15:24:20 1.1149.2.7
+++ src/share/mk/bsd.own.mk 2024/04/18 16:12:31 1.1149.2.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1149.2.7 2024/04/18 15:24:20 martin Exp $ 1# $NetBSD: bsd.own.mk,v 1.1149.2.8 2024/04/18 16:12:31 martin Exp $
2 2
3# This needs to be before bsd.init.mk 3# This needs to be before bsd.init.mk
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -988,29 +988,30 @@ MKSOFTFLOAT?= yes @@ -988,29 +988,30 @@ MKSOFTFLOAT?= yes
988# These platforms always use softfloat. 988# These platforms always use softfloat.
989# 989#
990.if (${MACHINE_CPU} == "arm" && ${MACHINE_ARCH:M*hf*} == "") || \ 990.if (${MACHINE_CPU} == "arm" && ${MACHINE_ARCH:M*hf*} == "") || \
991 ${MACHINE_ARCH} == "coldfire" || ${MACHINE_CPU} == "or1k" || \ 991 ${MACHINE_ARCH} == "coldfire" || ${MACHINE_CPU} == "or1k" || \
992 ${MACHINE} == "emips" || ${MACHINE_CPU} == "sh3" 992 ${MACHINE} == "emips" || ${MACHINE_CPU} == "sh3"
993MKSOFTFLOAT= yes 993MKSOFTFLOAT= yes
994.endif 994.endif
995 995
996.if ${MACHINE} == "emips" 996.if ${MACHINE} == "emips"
997SOFTFLOAT_BITS= 32 997SOFTFLOAT_BITS= 32
998.endif 998.endif
999 999
1000# 1000#
1001# We want to build zfs only for amd64 and aarch64 by default for now. 1001# We want to build zfs only for amd64, aarch64 and sparc64 by default for now.
1002# 1002#
1003.if ${MACHINE} == "amd64" || ${MACHINE_ARCH} == "aarch64" 1003.if ${MACHINE} == "amd64" || ${MACHINE_ARCH} == "aarch64" || \
 1004 ${MACHINE} == "sparc64"
1004MKZFS?= yes 1005MKZFS?= yes
1005.endif 1006.endif
1006 1007
1007# 1008#
1008# DTrace works on amd64, i386 and earm* 1009# DTrace works on amd64, i386 and earm*
1009# 1010#
1010.if ${MACHINE_ARCH} == "i386" || \ 1011.if ${MACHINE_ARCH} == "i386" || \
1011 ${MACHINE_ARCH} == "x86_64" || \ 1012 ${MACHINE_ARCH} == "x86_64" || \
1012 ${MACHINE_ARCH} == "aarch64" || \ 1013 ${MACHINE_ARCH} == "aarch64" || \
1013 !empty(MACHINE_ARCH:Mearm*) 1014 !empty(MACHINE_ARCH:Mearm*)
1014MKDTRACE?= yes 1015MKDTRACE?= yes
1015MKCTF?= yes 1016MKCTF?= yes
1016.endif 1017.endif