Mesa (staging/20.1): meson: don't build with USE_ELF_TLS on OpenBSD

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: ca8cb059585851152e1d2a3e8b01a4d11520c643
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca8cb059585851152e1d2a3e8b01a4d11520c643

Author: Jonathan Gray <jsg at jsg.id.au>
Date:   Fri Dec  6 15:23:36 2019 +1100

meson: don't build with USE_ELF_TLS on OpenBSD

OpenBSD does not have TLS

Fixes: a47c525f328 ("meson: build glx")
Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5630>
(cherry picked from commit c97af23b13c55c27f5fe381793ee9a3d6f3a2280)

---

 .pick_status.json | 2 +-
 meson.build       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7b8d2124900..b72b136a7b5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -787,7 +787,7 @@
         "description": "meson: don't build with USE_ELF_TLS on OpenBSD",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "a47c525f3281a2753180e076c7e9b7772aff8f06"
     },
diff --git a/meson.build b/meson.build
index 7e157fe04ef..6b2c76954b5 100644
--- a/meson.build
+++ b/meson.build
@@ -393,7 +393,7 @@ endif
 
 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
 use_elf_tls = false
-if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
   pre_args += '-DUSE_ELF_TLS'
   use_elf_tls = true
 endif