From af6923544de02ded648a736e07b9bd8b7c52dba9 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 23 Oct 2019 09:46:28 -0700 Subject: [PATCH] meson.build: make TLS ELF optional USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make TLS GLX optional again" patch updated to the latest mesa. Upstream-Status: Inappropriate [configuration] Signed-off-by: Alistair Francis --- meson.build | 2 +- meson_options.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index a1f098c..1e31eb4 100644 --- a/meson.build +++ b/meson.build @@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. -if not with_platform_android or get_option('platform-sdk-version') >= 29 +if (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') pre_args += '-DUSE_ELF_TLS' endif diff --git a/meson_options.txt b/meson_options.txt index b768c15..76cef24 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -333,6 +333,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) +option( + 'elf-tls', + type : 'boolean', + value : true, + description : 'Enable TLS support in ELF', +) option( 'I-love-half-baked-turnips', type : 'boolean',