From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Wed, 12 Jun 2019 14:15:57 -0300 Subject: [PATCH] meson.build: make TLS GLX optional again Organization: O.S. Systems Software LTDA. This was optional with autotools, and needs to be disabled when using musl C library, for instance. Upstream-Status: Pending Signed-off-by: Alexander Kanavin Signed-off-by: Fabio Berton Signed-off-by: Otavio Salvador --- meson.build | 4 +++- meson_options.txt | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index b33b430aed4..0e50bb26c0a 100644 --- a/meson.build +++ b/meson.build @@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat endif endif -pre_args += '-DGLX_USE_TLS' +if get_option('glx-tls') + pre_args += '-DGLX_USE_TLS' +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') diff --git a/meson_options.txt b/meson_options.txt index 1f72faabee8..fcd49efea27 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -339,6 +339,13 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) +option( + 'glx-tls', + type : 'boolean', + value : true, + description : 'Enable TLS support in GLX', +) + option( 'I-love-half-baked-turnips', type : 'boolean',