summaryrefslogtreecommitdiff
path: root/.pick_status.json
diff options
context:
space:
mode:
authorJonathan Gray <jsg@jsg.id.au>2019-12-06 15:23:36 +1100
committerDylan Baker <dylan.c.baker@intel.com>2020-09-01 13:53:30 -0700
commitdb2fa8208c8a9eefad29ed6e20cddd32d8382621 (patch)
treecb32b35efa27589ab07b9007d65d3fc150d532b7 /.pick_status.json
parentfe8d18e75254e7d1c91578ace6a34627ff636ed9 (diff)
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@jsg.id.au> Reviewed-by: Eric Engestrom <eric@engestrom.ch> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5630> (cherry picked from commit c97af23b13c55c27f5fe381793ee9a3d6f3a2280)
Diffstat (limited to '.pick_status.json')
-rw-r--r--.pick_status.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 6ed95504169..b424d5c3bf1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -913,7 +913,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"
},