Module Name: src
Committed By: mrg
Date: Thu Sep 29 03:53:13 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
enable xorg-server 1.18 for sparc64. minor consistency
To generate a diff of this commit:
cvs rdiff -u -r1.963 -r1.964 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.own.mk
diff -u src/share/mk/bsd.own.mk:1.963 src/share/mk/bsd.own.mk:1.964
--- src/share/mk/bsd.own.mk:1.963 Tue Sep 27 16:47:01 2016
+++ src/share/mk/bsd.own.mk Thu Sep 29 03:53:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.963 2016/09/27 16:47:01 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.964 2016/09/29 03:53:13 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1392,12 +1392,13 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
# During transition from xorg-server 1.10 to 1.18
.if \
- ${MACHINE_ARCH} == "x86_64" || \
- ${MACHINE_ARCH} == "i386" || \
+ ${MACHINE} == "amd64" || \
+ ${MACHINE} == "i386" || \
${MACHINE} == "ofppc" || \
${MACHINE} == "macppc" || \
${MACHINE} == "shark" || \
${MACHINE} == "sparc" || \
+ ${MACHINE} == "sparc64" || \
${MACHINE} == "x68k"
HAVE_XORG_SERVER_VER?=118
.else
