34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
|
|
Status: Not fixed upstream
|
|
|
|
diff --git meson.build meson.build
|
|
index e1e94e71049..96ab3fb3e45 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -447,7 +447,8 @@ endif
|
|
|
|
# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
|
|
use_elf_tls = false
|
|
-if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
|
|
+with_use_elf_tls = get_option('use-elf-tls')
|
|
+if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and with_use_elf_tls and
|
|
(not with_platform_android or get_option('platform-sdk-version') >= 29) and
|
|
(not with_platform_windows or not with_shared_glapi))
|
|
pre_args += '-DUSE_ELF_TLS'
|
|
diff --git meson_options.txt meson_options.txt
|
|
index a7030aba31e..966cfeca298 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -446,6 +446,12 @@ option(
|
|
value : 25,
|
|
description : 'Android Platform SDK version. Default: Nougat version.'
|
|
)
|
|
+option(
|
|
+ 'use-elf-tls',
|
|
+ type : 'boolean',
|
|
+ value : true,
|
|
+ description : 'Build support for initial-exec TLS model'
|
|
+)
|
|
option(
|
|
'zstd',
|
|
type : 'combo',
|