From fe8d18e75254e7d1c91578ace6a34627ff636ed9 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Thu, 21 Nov 2019 22:14:50 +0000
Subject: meson: don't advertise TLS support if glx wasn't build with it

Fixes: a47c525f328 ("meson: build glx")
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5630>
(cherry picked from commit 9ac16864227cc63ca6b23eeab39fdcc7f85beca5)
---
 .pick_status.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.pick_status.json')

diff --git a/.pick_status.json b/.pick_status.json
index b136d4924ab..6ed95504169 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -922,7 +922,7 @@
         "description": "meson: don't advertise TLS support if glx wasn't build with it",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "a47c525f3281a2753180e076c7e9b7772aff8f06"
     },
-- 
cgit v1.2.3