Module Name: src
Committed By: riastradh
Date: Sun May 5 15:25:31 UTC 2024
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/dri.old: Makefile
Log Message:
mesa: Build with -Wno-error=typedef-redefinition.
While here, use CWARNFLAGS.clang instead of an explicit conditional.
In file included from 110_blorp_exec.c:33:
In file included from
/home/source/ab/HEAD-llvm/xsrc/external/mit/MesaLib/dist/src/intel/blorp/blorp_genX_exec.h:27:
In file included from
/home/source/ab/HEAD-llvm/xsrc/external/mit/MesaLib/dist/src/intel/blorp/blorp_priv.h:30:
/home/source/ab/HEAD-llvm/xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir.h:3840:3:
error: redefinition of typedef 'nir_shader' is a C11 feature
[-Werror,-Wtypedef-redefinition]
} nir_shader;
^
/home/source/ab/HEAD-llvm/xsrc/external/mit/MesaLib/dist/src/intel/compiler/brw_compiler.h:41:27:
note: previous definition is here
typedef struct nir_shader nir_shader;
^
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/dri.old/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.41 src/external/mit/xorg/lib/dri/Makefile:1.42
--- src/external/mit/xorg/lib/dri/Makefile:1.41 Fri Apr 26 17:22:26 2024
+++ src/external/mit/xorg/lib/dri/Makefile Sun May 5 15:25:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/04/26 17:22:26 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2024/05/05 15:25:31 riastradh Exp $
# Link the mesa_dri_drivers mega driver.
@@ -485,7 +485,8 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
CPPFLAGS.isl_tiled_memcpy_sse41.c+= -msse4.1
.endif
-CFLAGS+= ${${ACTIVE_CC} == "clang":? -Wno-error=atomic-alignment :}
+CWARNFLAGS.clang+= -Wno-error=atomic-alignment
+CWARNFLAGS.clang+= -Wno-error=typedef-redefinition
.include "../driver.mk"
Index: src/external/mit/xorg/lib/dri.old/Makefile
diff -u src/external/mit/xorg/lib/dri.old/Makefile:1.8 src/external/mit/xorg/lib/dri.old/Makefile:1.9
--- src/external/mit/xorg/lib/dri.old/Makefile:1.8 Tue Aug 8 06:27:31 2023
+++ src/external/mit/xorg/lib/dri.old/Makefile Sun May 5 15:25:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/08/08 06:27:31 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2024/05/05 15:25:31 riastradh Exp $
# Link the mesa_dri_drivers mega driver.
@@ -458,7 +458,8 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
CPPFLAGS.isl_tiled_memcpy_sse41.c+= -msse4.1
.endif
-CFLAGS+= ${${ACTIVE_CC} == "clang":? -Wno-error=atomic-alignment :}
+CWARNFLAGS.clang+= -Wno-error=atomic-alignment
+CWARNFLAGS.clang+= -Wno-error=typedef-redefinition
.include "../driver${OLD_SUFFIX}.mk"
