From b1433c1b1e1539b05758a242e2b3a3f94fb3b5f6 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@engestrom.ch>
Date: Tue, 1 Sep 2020 22:09:43 +0200
Subject: [PATCH] meson: drop leftover PTHREAD_SETAFFINITY_IN_NP_HEADER

55765f80 replaced this with a check for the header itself.

Fixes: 55765f80b9ce7cce4ec6 ("util/u_thread: include pthread_np.h if found")
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Jonathan Gray <jsg@jsg.id.au>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6548>
(cherry picked from commit 0f4d09443eba0c5a219c943940ff970f3d583f56)
---
 .pick_status.json | 2 +-
 meson.build       | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index a0001b6bd56..dda9383bf45 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2704,7 +2704,7 @@
         "description": "meson: drop leftover PTHREAD_SETAFFINITY_IN_NP_HEADER",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "55765f80b9ce7cce4ec6a1c2bed6476776d9cbed"
     },
diff --git a/meson.build b/meson.build
index 37cbe19e277..ff5402f363e 100644
--- a/meson.build
+++ b/meson.build
@@ -1291,12 +1291,6 @@ if dep_thread.found() and host_machine.system() != 'windows'
       args : '-D_GNU_SOURCE')
     pre_args += '-DHAVE_PTHREAD_SETAFFINITY'
   endif
-  if cc.has_function(
-      'pthread_setaffinity_np',
-      dependencies : dep_thread,
-      prefix : '#include <pthread_np.h>')
-    pre_args += '-DPTHREAD_SETAFFINITY_IN_NP_HEADER'
-  endif
 endif
 if host_machine.system() != 'windows'
   dep_expat = dependency('expat', fallback : ['expat', 'expat_dep'])