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 | 14 |
1 files changed, 7 insertions, 7 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 89c0d150fa..df2346d336 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 ce57ce220d9c377beabf4914f33c43118f672ffe Mon Sep 17 00:00:00 2001 | 1 | From 624f430dd0a91344146a2b8d49a69f23560c2fa2 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 |
@@ -30,23 +30,23 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me> | |||
30 | 2 files changed, 7 insertions(+), 1 deletion(-) | 30 | 2 files changed, 7 insertions(+), 1 deletion(-) |
31 | 31 | ||
32 | diff --git a/meson.build b/meson.build | 32 | diff --git a/meson.build b/meson.build |
33 | index c5136ea..185270d 100644 | 33 | index efc6171..8450968 100644 |
34 | --- a/meson.build | 34 | --- a/meson.build |
35 | +++ b/meson.build | 35 | +++ b/meson.build |
36 | @@ -424,7 +424,7 @@ endif | 36 | @@ -448,7 +448,7 @@ endif |
37 | 37 | ||
38 | # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. | 38 | # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. |
39 | use_elf_tls = false | 39 | use_elf_tls = false |
40 | -if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) | 40 | -if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) |
41 | +if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') | 41 | +if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') |
42 | pre_args += '-DUSE_ELF_TLS' | 42 | pre_args += '-DUSE_ELF_TLS' |
43 | use_elf_tls = true | 43 | use_elf_tls = true |
44 | endif | 44 | endif |
45 | diff --git a/meson_options.txt b/meson_options.txt | 45 | diff --git a/meson_options.txt b/meson_options.txt |
46 | index 2d39d13..72006eb 100644 | 46 | index fc73f6e..d7482c0 100644 |
47 | --- a/meson_options.txt | 47 | --- a/meson_options.txt |
48 | +++ b/meson_options.txt | 48 | +++ b/meson_options.txt |
49 | @@ -368,6 +368,12 @@ option( | 49 | @@ -420,6 +420,12 @@ option( |
50 | value : true, | 50 | value : true, |
51 | description : 'Enable direct rendering in GLX and EGL for DRI', | 51 | description : 'Enable direct rendering in GLX and EGL for DRI', |
52 | ) | 52 | ) |