1*4882a593SmuzhiyunFrom bf41fa026ae3d378e62fd83d03a6f5933b52ca04 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Alistair Francis <alistair@alistair23.me> 3*4882a593SmuzhiyunDate: Thu, 14 Nov 2019 13:08:31 -0800 4*4882a593SmuzhiyunSubject: [PATCH] meson.build: make TLS ELF optional 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUSE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make 7*4882a593SmuzhiyunTLS GLX optional again" patch updated to the latest mesa. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunFor details, see: 10*4882a593Smuzhiyunhttps://gitlab.freedesktop.org/mesa/mesa/-/issues/966 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunThis prevents runtime segfault on musl: 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunTraceback (most recent call last): 15*4882a593Smuzhiyun File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f 16*4882a593Smuzhiyun return func(*args, **kwargs) 17*4882a593Smuzhiyun File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 378, in test_parselogs 18*4882a593Smuzhiyun self.assertEqual(errcount, 0, msg=self.msg) 19*4882a593SmuzhiyunAssertionError: 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*4882a593Smuzhiyun 21*4882a593SmuzhiyunUpstream-Status: Inappropriate [configuration] 22*4882a593Smuzhiyun--- 23*4882a593Smuzhiyun meson.build | 7 +++++-- 24*4882a593Smuzhiyun meson_options.txt | 6 ++++++ 25*4882a593Smuzhiyun 2 files changed, 11 insertions(+), 2 deletions(-) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyundiff --git a/meson.build b/meson.build 28*4882a593Smuzhiyunindex 70d06c0..1441611 100644 29*4882a593Smuzhiyun--- a/meson.build 30*4882a593Smuzhiyun+++ b/meson.build 31*4882a593Smuzhiyun@@ -490,8 +490,11 @@ foreach platform : _platforms 32*4882a593Smuzhiyun pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper()) 33*4882a593Smuzhiyun endforeach 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun-use_elf_tls = true 36*4882a593Smuzhiyun-pre_args += '-DUSE_ELF_TLS' 37*4882a593Smuzhiyun+use_elf_tls = false 38*4882a593Smuzhiyun+if get_option('elf-tls') 39*4882a593Smuzhiyun+ use_elf_tls = true 40*4882a593Smuzhiyun+ pre_args += '-DUSE_ELF_TLS' 41*4882a593Smuzhiyun+endif 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun if with_platform_android and get_option('platform-sdk-version') >= 29 44*4882a593Smuzhiyun # By default the NDK compiler, at least, emits emutls references instead of 45*4882a593Smuzhiyundiff --git a/meson_options.txt b/meson_options.txt 46*4882a593Smuzhiyunindex 1f6ef38..99cc5cb 100644 47*4882a593Smuzhiyun--- a/meson_options.txt 48*4882a593Smuzhiyun+++ b/meson_options.txt 49*4882a593Smuzhiyun@@ -440,6 +440,12 @@ option( 50*4882a593Smuzhiyun value : true, 51*4882a593Smuzhiyun description : 'Enable direct rendering in GLX and EGL for DRI', 52*4882a593Smuzhiyun ) 53*4882a593Smuzhiyun+option( 54*4882a593Smuzhiyun+ 'elf-tls', 55*4882a593Smuzhiyun+ type : 'boolean', 56*4882a593Smuzhiyun+ value : true, 57*4882a593Smuzhiyun+ description : 'Enable TLS support in ELF', 58*4882a593Smuzhiyun+) 59*4882a593Smuzhiyun option('egl-lib-suffix', 60*4882a593Smuzhiyun type : 'string', 61*4882a593Smuzhiyun value : '', 62