Module Name: src
Committed By: mrg
Date: Sat Jun 15 20:33:06 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch netwinder and alpha over to xorg-server 1.20.
the leaves sgimips as the only remaining xorg-server 1.10
consumer, and largely because it has XAA and EXA and the
sgimips drivers does not work well.
To generate a diff of this commit:
cvs rdiff -u -r1.1376 -r1.1377 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.1376 src/share/mk/bsd.own.mk:1.1377
--- src/share/mk/bsd.own.mk:1.1376 Sat Jun 8 13:03:41 2024
+++ src/share/mk/bsd.own.mk Sat Jun 15 20:33:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1376 2024/06/08 13:03:41 tsutsui Exp $
+# $NetBSD: bsd.own.mk,v 1.1377 2024/06/15 20:33:05 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1330,10 +1330,9 @@ MKDTB.riscv32= yes
MKDTB.riscv64= yes
# During transition from xorg-server 1.10 to 1.20
-.if \
- ${MACHINE} == "alpha" || \
- ${MACHINE} == "netwinder" || \
- ${MACHINE} == "sgimips"
+# XXX sgimips uses XAA which is removed in 1.20, and EXA is hard
+# XXX to do the same with.
+.if ${MACHINE} == "sgimips"
HAVE_XORG_SERVER_VER?=110
.else
HAVE_XORG_SERVER_VER?=120
