Mesa (master): meson: OpenMP is supposed to be optional

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 5b9253c28706f3719bffd147b4fa803c7ef544a7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b9253c28706f3719bffd147b4fa803c7ef544a7

Author: Dylan Baker <dylan.c.baker at intel.com>
Date:   Fri Apr 16 09:24:27 2021 -0700

meson: OpenMP is supposed to be optional

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 at collabora.com>
Tested-by: Bernd Kuhls <bernd.kuhls at t-online.de>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10286>

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 2849ae00492..7c1cc07fd59 100644
--- a/meson.build
+++ b/meson.build
@@ -1872,7 +1872,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