From 689d7a83218d6b656bbfc775ae65b9aaee762d70 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Fri, 10 May 2024 11:14:58 -0400 Subject: [PATCH] fix mesa build on arm --- Frameworks/OpenGL/mesa/Makefile | 1 + Frameworks/OpenGL/mesa/meson.build | 4 ++-- Frameworks/OpenGL/mesa/src/microsoft/vulkan/meson.build | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Frameworks/OpenGL/mesa/Makefile b/Frameworks/OpenGL/mesa/Makefile index 537ba993e130..88a1bf757c20 100644 --- a/Frameworks/OpenGL/mesa/Makefile +++ b/Frameworks/OpenGL/mesa/Makefile @@ -14,6 +14,7 @@ CFLAGS+= -I${.CURDIR}/../libdrm/nouveau CFLAGS+= -I${.CURDIR}/../libdrm/radeon CFLAGS+= -I${.CURDIR}/../libdrm/intel CFLAGS+= -I${.CURDIR}/../libdrm/include/drm +CFLAGS+= -Wno-format -Wno-asm-operand-widths LDFLAGS= -L${MAKEOBJDIR}/../wayland/src -lwayland LDFLAGS+= -L${MAKEOBJDIR}/../libdrm -ldrm diff --git a/Frameworks/OpenGL/mesa/meson.build b/Frameworks/OpenGL/mesa/meson.build index ebaa33725051..cde70e47b624 100644 --- a/Frameworks/OpenGL/mesa/meson.build +++ b/Frameworks/OpenGL/mesa/meson.build @@ -1110,8 +1110,8 @@ else # MinGW chokes on format specifiers and I can't get it all working if not (cc.get_argument_syntax() == 'gcc' and host_machine.system() == 'windows') - _trial_c += ['-Werror=format', '-Wformat-security'] - _trial_cpp += ['-Werror=format', '-Wformat-security'] + _trial_c += ['-Wformat-security'] + _trial_cpp += ['-Wformat-security'] endif # FreeBSD annotated but Mesa isn't ready diff --git a/Frameworks/OpenGL/mesa/src/microsoft/vulkan/meson.build b/Frameworks/OpenGL/mesa/src/microsoft/vulkan/meson.build index 0c7e2d425680..13f9152f7468 100644 --- a/Frameworks/OpenGL/mesa/src/microsoft/vulkan/meson.build +++ b/Frameworks/OpenGL/mesa/src/microsoft/vulkan/meson.build @@ -70,7 +70,6 @@ if cc.get_argument_syntax() != 'msvc' '-Werror=unused-variable', '-Werror=unused-but-set-variable', '-Werror=unused-value', - '-Werror=format', '-Werror=switch', ] dzn_flags += cc.get_supported_arguments(dzn_flags_to_try)