diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-24 11:13:37 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-25 22:35:54 +0100 |
| commit | 2b91620cdb2047fd3df8e951a80142b67af85f26 (patch) | |
| tree | 1679865fbd5deb9cc1aea678c5e618a54ec24ffa /meta/recipes-graphics/mesa/files | |
| parent | 8f97315e2fbec7308b77d5b53077014bbd973c53 (diff) | |
| download | openembedded-core-contrib-2b91620cdb2047fd3df8e951a80142b67af85f26.tar.gz | |
mesa: update 21.0.3 -> 21.1.1
License-Update: typo fix
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
| -rw-r--r-- | meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch | 18 |
1 files changed, 9 insertions, 9 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 df2346d336..eac6d4df89 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 @@ -From 624f430dd0a91344146a2b8d49a69f23560c2fa2 Mon Sep 17 00:00:00 2001 +From d434b9e5d29d614b57c09e164e1d084094bf2150 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair@alistair23.me> Date: Thu, 14 Nov 2019 13:08:31 -0800 Subject: [PATCH] meson.build: make TLS ELF optional @@ -30,23 +30,23 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me> 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index efc6171..8450968 100644 +index 42f448e..02f6e33 100644 --- a/meson.build +++ b/meson.build -@@ -448,7 +448,7 @@ endif - - # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. +@@ -449,7 +449,7 @@ endif 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 ['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') + 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)) ++ (not with_platform_windows or not with_shared_glapi) 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 fc73f6e..d7482c0 100644 +index a7030ab..635ec20 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -420,6 +420,12 @@ option( +@@ -421,6 +421,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) |