From 7359a3cc1a51da081b575c5ccd1a8da6a4dbc1e5 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan.c.baker@intel.com>
Date: Fri, 16 Apr 2021 09:24:27 -0700
Subject: [PATCH] meson: OpenMP is supposed to be optional
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The code around it checks that it is found, so clearly it was meant to
be optional, not arequired.

Fixes: cd2832ee5107201493d59f70983f162653e53c7d
       ("meson: add an optional OpenMP dependency for AMD tests")

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10286>
(cherry picked from commit 5b9253c28706f3719bffd147b4fa803c7ef544a7)
---
 .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 b0635fd1c86..efa1d6e2592 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -490,7 +490,7 @@
         "description": "meson: OpenMP is supposed to be optional",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "cd2832ee5107201493d59f70983f162653e53c7d"
     },
diff --git a/meson.build b/meson.build
index 8ef1e5f71aa..e1e94e71049 100644
--- a/meson.build
+++ b/meson.build
@@ -1860,7 +1860,7 @@ dep_openmp = null_dep
 
 # Even if we find OpenMP, Gitlab CI fails to link with gcc/i386 and clang/anyarch.
 if host_machine.cpu_family() == 'x86_64' and cc.get_id() == 'gcc'
-  dep_openmp = dependency('openmp')
+  dep_openmp = dependency('openmp', required : false)
   if dep_openmp.found()
     pre_args += ['-DHAVE_OPENMP']
   endif