fix mesa build on arm

ravynsoft · May 13, 2024 · 689d7a8 · 689d7a8
1 parent 30ab375
commit 689d7a8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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 <pthread.h> 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
@@ -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)