summaryrefslogtreecommitdiff
path: root/user/mesa/no-tls.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/mesa/no-tls.patch')
-rw-r--r--user/mesa/no-tls.patch15
1 files changed, 8 insertions, 7 deletions
diff --git a/user/mesa/no-tls.patch b/user/mesa/no-tls.patch
index b5e0b3adb..a6b989e87 100644
--- a/user/mesa/no-tls.patch
+++ b/user/mesa/no-tls.patch
@@ -1,14 +1,15 @@
---- mesa-19.3.1/meson.build.old 2019-12-18 18:36:00.000000000 +0000
-+++ mesa-19.3.1/meson.build 2020-01-26 05:11:44.774286868 +0000
-@@ -386,11 +386,6 @@
- endif
+--- mesa-20.3.5/meson.build.old 2021-03-24 14:10:48.523084000 -0500
++++ mesa-20.3.5/meson.build 2022-05-29 23:43:09.679306824 -0500
+@@ -434,12 +434,7 @@
+ with_egl = false
endif
-# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
--if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+ use_elf_tls = false
+-if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
- pre_args += '-DUSE_ELF_TLS'
+- use_elf_tls = true
-endif
--
+
if with_glx != 'disabled'
if not (with_platform_x11 and with_any_opengl)
- error('Cannot build GLX support without X11 platform support and at least one OpenGL API')