Module Name: src
Committed By: martin
Date: Wed Apr 24 19:14:39 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Force old Mesa for all old X server builds
To generate a diff of this commit:
cvs rdiff -u -r1.1370 -r1.1371 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.1370 src/share/mk/bsd.own.mk:1.1371
--- src/share/mk/bsd.own.mk:1.1370 Wed Apr 24 07:54:53 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 19:14:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1370 2024/04/24 07:54:53 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1371 2024/04/24 19:14:39 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1320,10 +1320,18 @@ MKDTB.earmv7hfeb= yes
MKDTB.riscv32= yes
MKDTB.riscv64= yes
-# alpha build fails due to missing X include files,
-# vax build triggers a gcc bug and dies with an internal compiler error.
-# XXX switch both to old Mesa for now.
-.if ${MACHINE} == "alpha" || ${MACHINE} == "vax"
+# During transition from xorg-server 1.10 to 1.20
+.if \
+ ${MACHINE} == "alpha" || \
+ ${MACHINE} == "netwinder" || \
+ ${MACHINE} == "sgimips"
+HAVE_XORG_SERVER_VER?=110
+.else
+HAVE_XORG_SERVER_VER?=120
+.endif
+
+# Newer Mesa does not build with old X server
+.if ${HAVE_XORG_SERVER_VER} != "120"
HAVE_MESA_VER=19
.endif
@@ -1676,16 +1684,6 @@ X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib
X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
.endfor
-# During transition from xorg-server 1.10 to 1.20
-.if \
- ${MACHINE} == "alpha" || \
- ${MACHINE} == "netwinder" || \
- ${MACHINE} == "sgimips"
-HAVE_XORG_SERVER_VER?=110
-.else
-HAVE_XORG_SERVER_VER?=120
-.endif
-
.if ${HAVE_XORG_SERVER_VER} == "120"
XORG_SERVER_SUBDIR?=xorg-server
. if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "evbarm"
