Mesa (staging/21.2): meson: disable -Werror=thread-safety on FreeBSD

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 81d4f432a956b5967089320c5b86ba9bf72e9325
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=81d4f432a956b5967089320c5b86ba9bf72e9325

Author: Jan Beich <jbeich at FreeBSD.org>
Date:   Sat Feb 20 12:30:56 2021 +0000

meson: disable -Werror=thread-safety on FreeBSD

Annotated <pthread.h> exposes too many errors in Mesa that are
non-trivial to fix and keep working without FreeBSD CI.

Fixes: 0d5fe24c9b7d ("macros: Add thread-safety annotation macros")
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9168>
(cherry picked from commit 60b7c3a0f49241f95e5b6f8da5d60eaa7bbeaabb)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index c88a52b7793..63ab64e108b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -373,7 +373,7 @@
         "description": "meson: disable -Werror=thread-safety on FreeBSD",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "0d5fe24c9b7de15241727922e18c3ea08d11ef08"
     },
diff --git a/meson.build b/meson.build
index 155db287796..9f0b3cba548 100644
--- a/meson.build
+++ b/meson.build
@@ -1093,7 +1093,6 @@ else
     '-Werror=incompatible-pointer-types',
     '-Werror=int-conversion',
     '-Wimplicit-fallthrough',
-    '-Werror=thread-safety',
     '-Wno-missing-field-initializers',
     '-Wno-format-truncation',
     '-fno-math-errno',
@@ -1105,6 +1104,10 @@ else
   if not (cc.get_id() == 'gcc' and host_machine.system() == 'windows')
     _trial += ['-Werror=format', '-Wformat-security']
   endif
+  # FreeBSD annotated <pthread.h> but Mesa isn't ready
+  if not (cc.get_id() == 'clang' and host_machine.system() == 'freebsd')
+    _trial += ['-Werror=thread-safety']
+  endif
   foreach a : _trial
     if cc.has_argument(a)
       c_args += a