Wed Apr 24 20:38:24 2024 UTC (15d)
Explicitly exclude VAX from new Mesa due to a gcc internal compiler error


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

--- src/share/mk/bsd.own.mk 2024/04/24 19:14:39 1.1371
+++ src/share/mk/bsd.own.mk 2024/04/24 20:38:24 1.1372
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1371 2024/04/24 19:14:39 martin Exp $ 1# $NetBSD: bsd.own.mk,v 1.1372 2024/04/24 20:38:24 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#
@@ -1321,27 +1321,28 @@ MKDTB.riscv32= yes @@ -1321,27 +1321,28 @@ MKDTB.riscv32= yes
1321MKDTB.riscv64= yes 1321MKDTB.riscv64= yes
1322 1322
1323# During transition from xorg-server 1.10 to 1.20 1323# During transition from xorg-server 1.10 to 1.20
1324.if \ 1324.if \
1325 ${MACHINE} == "alpha" || \ 1325 ${MACHINE} == "alpha" || \
1326 ${MACHINE} == "netwinder" || \ 1326 ${MACHINE} == "netwinder" || \
1327 ${MACHINE} == "sgimips" 1327 ${MACHINE} == "sgimips"
1328HAVE_XORG_SERVER_VER?=110 1328HAVE_XORG_SERVER_VER?=110
1329.else 1329.else
1330HAVE_XORG_SERVER_VER?=120 1330HAVE_XORG_SERVER_VER?=120
1331.endif 1331.endif
1332 1332
1333# Newer Mesa does not build with old X server 1333# Newer Mesa does not build with old X server
1334.if ${HAVE_XORG_SERVER_VER} != "120" 1334# VAX build triggers a gcc internal error
 1335.if ${HAVE_XORG_SERVER_VER} != "120" || ${MACHINE} == "vax"
1335HAVE_MESA_VER=19 1336HAVE_MESA_VER=19
1336.endif 1337.endif
1337 1338
1338HAVE_MESA_VER?= 21 1339HAVE_MESA_VER?= 21
1339.if ${HAVE_MESA_VER} == 19 1340.if ${HAVE_MESA_VER} == 19
1340EXTERNAL_MESALIB_DIR?= MesaLib.old 1341EXTERNAL_MESALIB_DIR?= MesaLib.old
1341.elif ${HAVE_MESA_VER} == 21 1342.elif ${HAVE_MESA_VER} == 21
1342EXTERNAL_MESALIB_DIR?= MesaLib 1343EXTERNAL_MESALIB_DIR?= MesaLib
1343.endif 1344.endif
1344 1345
1345# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18 or newer 1346# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18 or newer
1346# XXX This knows that MKX11=no is default below, but would 1347# XXX This knows that MKX11=no is default below, but would
1347# require splitting the below loop in two parts. 1348# require splitting the below loop in two parts.