From 9dc872c4c7a86a7e0258850e06177d94e4cb10e4 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Thu, 7 Nov 2024 14:15:30 +0100
Subject: [PATCH] meson: move openmp block out of the middle of the x11 deps
 block

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32032>
---
 meson.build | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/meson.build b/meson.build
index ad230998d46..949fc5d6a81 100644
--- a/meson.build
+++ b/meson.build
@@ -2037,6 +2037,15 @@ if with_platform_wayland
   endif
 endif
 
+# Even if we find OpenMP, Gitlab CI fails to link with gcc/i386 and clang/anyarch.
+dep_openmp = null_dep
+if host_machine.cpu_family() == 'x86_64' and cc.get_id() == 'gcc'
+  dep_openmp = dependency('openmp', required : false)
+  if dep_openmp.found()
+    pre_args += ['-DHAVE_OPENMP']
+  endif
+endif
+
 dep_x11 = null_dep
 dep_xext = null_dep
 dep_xfixes = null_dep
@@ -2056,15 +2065,6 @@ dep_xshmfence = null_dep
 dep_xcb_xrandr = null_dep
 dep_xcb_shm = null_dep
 dep_xlib_xrandr = null_dep
-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', required : false)
-  if dep_openmp.found()
-    pre_args += ['-DHAVE_OPENMP']
-  endif
-endif
 
 with_dri3_explicit_sync = false
 with_xcb_keysyms = false