diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch index cd35a1f850..91e59d14ed 100644 --- a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +++ b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From df835389699b32bb6610b39972502e323f8e09e5 Mon Sep 17 00:00:00 2001 | 1 | From dd1d15c75f6ff8ee96cf1e7b74e582bff3183ef6 Mon Sep 17 00:00:00 2001 |
2 | From: Alistair Francis <alistair@alistair23.me> | 2 | From: Alistair Francis <alistair@alistair23.me> |
3 | Date: Thu, 14 Nov 2019 13:08:31 -0800 | 3 | Date: Thu, 14 Nov 2019 13:08:31 -0800 |
4 | Subject: [PATCH] meson.build: make TLS ELF optional | 4 | Subject: [PATCH] meson.build: make TLS ELF optional |
@@ -15,10 +15,10 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me> | |||
15 | 2 files changed, 7 insertions(+), 1 deletion(-) | 15 | 2 files changed, 7 insertions(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/meson.build b/meson.build | 17 | diff --git a/meson.build b/meson.build |
18 | index 09e3759..a954118 100644 | 18 | index 261b588..311436e 100644 |
19 | --- a/meson.build | 19 | --- a/meson.build |
20 | +++ b/meson.build | 20 | +++ b/meson.build |
21 | @@ -387,7 +387,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat | 21 | @@ -392,7 +392,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat |
22 | endif | 22 | endif |
23 | 23 | ||
24 | # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. | 24 | # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. |
@@ -28,10 +28,10 @@ index 09e3759..a954118 100644 | |||
28 | endif | 28 | endif |
29 | 29 | ||
30 | diff --git a/meson_options.txt b/meson_options.txt | 30 | diff --git a/meson_options.txt b/meson_options.txt |
31 | index 626baf3..637ff14 100644 | 31 | index ab43150..d7b1555 100644 |
32 | --- a/meson_options.txt | 32 | --- a/meson_options.txt |
33 | +++ b/meson_options.txt | 33 | +++ b/meson_options.txt |
34 | @@ -341,6 +341,12 @@ option( | 34 | @@ -355,6 +355,12 @@ option( |
35 | value : true, | 35 | value : true, |
36 | description : 'Enable direct rendering in GLX and EGL for DRI', | 36 | description : 'Enable direct rendering in GLX and EGL for DRI', |
37 | ) | 37 | ) |
@@ -42,5 +42,5 @@ index 626baf3..637ff14 100644 | |||
42 | + description : 'Enable TLS support in ELF', | 42 | + description : 'Enable TLS support in ELF', |
43 | +) | 43 | +) |
44 | option( | 44 | option( |
45 | 'I-love-half-baked-turnips', | 45 | 'prefer-iris', |
46 | type : 'boolean', | 46 | type : 'boolean', |