diff options
Diffstat (limited to 'recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch')
| -rw-r--r-- | recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch b/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch index 80fd1ff..d0266fb 100644 --- a/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +++ b/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch @@ -1,4 +1,4 @@ -From 3758cfb761ee0981ea8278f1c3f2f8633234d317 Mon Sep 17 00:00:00 2001 +From 372820ee40ba52f03672477245fafa395dd29009 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair@alistair23.me> Date: Wed, 2 Sep 2020 15:28:50 -0500 Subject: [PATCH] meson.build: make TLS ELF optional @@ -9,28 +9,30 @@ TLS GLX optional again" patch updated to the latest mesa. Upstream-Status: Inappropriate [configuration] Signed-off-by: Alistair Francis <alistair@alistair23.me> --- - meson.build | 2 +- + meson.build | 4 +--- meson_options.txt | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build -index efc61711f4d..bda122b6465 100644 +index 142f3839e91..d80d795bf66 100644 --- a/meson.build +++ b/meson.build -@@ -448,7 +448,7 @@ endif +@@ -449,9 +449,7 @@ endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. use_elf_tls = false --if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) +-if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and +- (not with_platform_android or get_option('platform-sdk-version') >= 29) and +- (not with_platform_windows or not with_shared_glapi)) +if (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') pre_args += '-DUSE_ELF_TLS' use_elf_tls = true endif diff --git a/meson_options.txt b/meson_options.txt -index fc73f6e1c24..d7482c0ab84 100644 +index 599a2b3fd89..11a4cc532b9 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -420,6 +420,12 @@ option( +@@ -426,6 +426,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) @@ -44,5 +46,5 @@ index fc73f6e1c24..d7482c0ab84 100644 'prefer-iris', type : 'boolean', -- -2.30.0 +2.30.1 |