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 | 61 |
1 files changed, 0 insertions, 61 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 deleted file mode 100644 index 89c0d150fa..0000000000 --- a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | From ce57ce220d9c377beabf4914f33c43118f672ffe Mon Sep 17 00:00:00 2001 | ||
2 | From: Alistair Francis <alistair@alistair23.me> | ||
3 | Date: Thu, 14 Nov 2019 13:08:31 -0800 | ||
4 | Subject: [PATCH] meson.build: make TLS ELF optional | ||
5 | |||
6 | USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make | ||
7 | TLS GLX optional again" patch updated to the latest mesa. | ||
8 | |||
9 | For details, see: | ||
10 | https://gitlab.freedesktop.org/mesa/mesa/-/issues/966 | ||
11 | |||
12 | This prevents runtime segfault on musl: | ||
13 | |||
14 | Traceback (most recent call last): | ||
15 | File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f | ||
16 | return func(*args, **kwargs) | ||
17 | File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 378, in test_parselogs | ||
18 | self.assertEqual(errcount, 0, msg=self.msg) | ||
19 | AssertionError: 1 != 0 : Log: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/qemux86-poky-linux-musl/core-image-sato-sdk/1.0-r0/target_logs/Xorg.0.log | ||
20 | ----------------------- | ||
21 | Central error: [ 10.477] (EE) Failed to load /usr/lib/xorg/modules/extensions/libglx.so: Error relocating /usr/lib/libGL.so.1: alphasort: initial-exec TLS resolves to dynamic definition in /usr/lib/libGL.so.1 | ||
22 | *********************** | ||
23 | |||
24 | Upstream-Status: Inappropriate [configuration] | ||
25 | Signed-off-by: Alistair Francis <alistair@alistair23.me> | ||
26 | |||
27 | --- | ||
28 | meson.build | 2 +- | ||
29 | meson_options.txt | 6 ++++++ | ||
30 | 2 files changed, 7 insertions(+), 1 deletion(-) | ||
31 | |||
32 | diff --git a/meson.build b/meson.build | ||
33 | index c5136ea..185270d 100644 | ||
34 | --- a/meson.build | ||
35 | +++ b/meson.build | ||
36 | @@ -424,7 +424,7 @@ endif | ||
37 | |||
38 | # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. | ||
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) | ||
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') | ||
42 | pre_args += '-DUSE_ELF_TLS' | ||
43 | use_elf_tls = true | ||
44 | endif | ||
45 | diff --git a/meson_options.txt b/meson_options.txt | ||
46 | index 2d39d13..72006eb 100644 | ||
47 | --- a/meson_options.txt | ||
48 | +++ b/meson_options.txt | ||
49 | @@ -368,6 +368,12 @@ option( | ||
50 | value : true, | ||
51 | description : 'Enable direct rendering in GLX and EGL for DRI', | ||
52 | ) | ||
53 | +option( | ||
54 | + 'elf-tls', | ||
55 | + type : 'boolean', | ||
56 | + value : true, | ||
57 | + description : 'Enable TLS support in ELF', | ||
58 | +) | ||
59 | option( | ||
60 | 'prefer-iris', | ||
61 | type : 'boolean', | ||