Wed Apr 24 07:54:53 2024 UTC (15d)
Switch alpha and VAX back to old Mesa for now untill someone fixes
those builds with newer Mesa.


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

--- src/share/mk/bsd.own.mk 2024/04/24 05:20:35 1.1369
+++ src/share/mk/bsd.own.mk 2024/04/24 07:54:53 1.1370
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1369 2024/04/24 05:20:35 nia Exp $ 1# $NetBSD: bsd.own.mk,v 1.1370 2024/04/24 07:54:53 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#
@@ -1310,26 +1310,33 @@ MKTEGRAFIRMWARE.evbarm= yes @@ -1310,26 +1310,33 @@ MKTEGRAFIRMWARE.evbarm= yes
1310MKDTB.aarch64= yes 1310MKDTB.aarch64= yes
1311MKDTB.aarch64eb= yes 1311MKDTB.aarch64eb= yes
1312MKDTB.earmv6= yes 1312MKDTB.earmv6= yes
1313MKDTB.earmv6hf= yes 1313MKDTB.earmv6hf= yes
1314MKDTB.earmv6eb= yes 1314MKDTB.earmv6eb= yes
1315MKDTB.earmv6hfeb= yes 1315MKDTB.earmv6hfeb= yes
1316MKDTB.earmv7= yes 1316MKDTB.earmv7= yes
1317MKDTB.earmv7hf= yes 1317MKDTB.earmv7hf= yes
1318MKDTB.earmv7eb= yes 1318MKDTB.earmv7eb= yes
1319MKDTB.earmv7hfeb= yes 1319MKDTB.earmv7hfeb= yes
1320MKDTB.riscv32= yes 1320MKDTB.riscv32= yes
1321MKDTB.riscv64= yes 1321MKDTB.riscv64= yes
1322 1322
 1323# alpha build fails due to missing X include files,
 1324# vax build triggers a gcc bug and dies with an internal compiler error.
 1325# XXX switch both to old Mesa for now.
 1326.if ${MACHINE} == "alpha" || ${MACHINE} == "vax"
 1327HAVE_MESA_VER=19
 1328.endif
 1329
1323HAVE_MESA_VER?= 21 1330HAVE_MESA_VER?= 21
1324.if ${HAVE_MESA_VER} == 19 1331.if ${HAVE_MESA_VER} == 19
1325EXTERNAL_MESALIB_DIR?= MesaLib.old 1332EXTERNAL_MESALIB_DIR?= MesaLib.old
1326.elif ${HAVE_MESA_VER} == 21 1333.elif ${HAVE_MESA_VER} == 21
1327EXTERNAL_MESALIB_DIR?= MesaLib 1334EXTERNAL_MESALIB_DIR?= MesaLib
1328.endif 1335.endif
1329 1336
1330# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18 or newer 1337# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18 or newer
1331# XXX This knows that MKX11=no is default below, but would 1338# XXX This knows that MKX11=no is default below, but would
1332# require splitting the below loop in two parts. 1339# require splitting the below loop in two parts.
1333.if ${MKX11:Uno} != "no" && ${HAVE_MESA_VER} >= 19 1340.if ${MKX11:Uno} != "no" && ${HAVE_MESA_VER} >= 19
1334MKLLVMRT.amd64= yes 1341MKLLVMRT.amd64= yes
1335MKLLVMRT.i386= yes 1342MKLLVMRT.i386= yes