1From bf41fa026ae3d378e62fd83d03a6f5933b52ca04 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair@alistair23.me>
3Date: Thu, 14 Nov 2019 13:08:31 -0800
4Subject: [PATCH] meson.build: make TLS ELF optional
5
6USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
7TLS GLX optional again" patch updated to the latest mesa.
8
9For details, see:
10https://gitlab.freedesktop.org/mesa/mesa/-/issues/966
11
12This prevents runtime segfault on musl:
13
14Traceback (most recent call last):
15  File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f
16    return func(*args, **kwargs)
17  File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 378, in test_parselogs
18    self.assertEqual(errcount, 0, msg=self.msg)
19AssertionError: 1 != 0 : Log: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/qemux86-poky-linux-musl/core-image-sato-sdk/1.0-r0/target_logs/Xorg.0.log
20
21Upstream-Status: Inappropriate [configuration]
22---
23 meson.build       | 7 +++++--
24 meson_options.txt | 6 ++++++
25 2 files changed, 11 insertions(+), 2 deletions(-)
26
27diff --git a/meson.build b/meson.build
28index 70d06c0..1441611 100644
29--- a/meson.build
30+++ b/meson.build
31@@ -490,8 +490,11 @@ foreach platform : _platforms
32   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
33 endforeach
34
35-use_elf_tls = true
36-pre_args += '-DUSE_ELF_TLS'
37+use_elf_tls = false
38+if get_option('elf-tls')
39+  use_elf_tls = true
40+  pre_args += '-DUSE_ELF_TLS'
41+endif
42
43 if with_platform_android and get_option('platform-sdk-version') >= 29
44   # By default the NDK compiler, at least, emits emutls references instead of
45diff --git a/meson_options.txt b/meson_options.txt
46index 1f6ef38..99cc5cb 100644
47--- a/meson_options.txt
48+++ b/meson_options.txt
49@@ -440,6 +440,12 @@ option(
50   value : true,
51   description : 'Enable direct rendering in GLX and EGL for DRI',
52 )
53+option(
54+  'elf-tls',
55+  type : 'boolean',
56+  value : true,
57+  description : 'Enable TLS support in ELF',
58+)
59 option('egl-lib-suffix',
60   type : 'string',
61   value : '',
62