1 From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001
2 From: Fabio Berton <fabio.berton@ossystems.com.br>
3 Date: Wed, 12 Jun 2019 14:15:57 -0300
4 Subject: [PATCH] meson.build: make TLS GLX optional again
5 Organization: O.S. Systems Software LTDA.
7 This was optional with autotools, and needs to be disabled
8 when using musl C library, for instance.
10 Upstream-Status: Pending
12 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
14 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
17 meson_options.txt | 7 +++++++
18 2 files changed, 10 insertions(+), 1 deletion(-)
20 diff --git a/meson.build b/meson.build
21 index b33b430aed4..0e50bb26c0a 100644
24 @@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
28 -pre_args += '-DGLX_USE_TLS'
29 +if get_option('glx-tls')
30 + pre_args += '-DGLX_USE_TLS'
32 if with_glx != 'disabled'
33 if not (with_platform_x11 and with_any_opengl)
34 error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
35 diff --git a/meson_options.txt b/meson_options.txt
36 index 1f72faabee8..fcd49efea27 100644
37 --- a/meson_options.txt
38 +++ b/meson_options.txt
39 @@ -339,6 +339,13 @@ option(
41 description : 'Enable direct rendering in GLX and EGL for DRI',
47 + description : 'Enable TLS support in GLX',
51 'I-love-half-baked-turnips',