Mesa (18.2): meson: Don't compile pipe loader with dri support when not using dri

[GitLab Mirror]

Module: Mesa
Branch: 18.2
Commit: 56acf932dee57edb237e3635429b73fa298d13bf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=56acf932dee57edb237e3635429b73fa298d13bf

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Mon Sep 17 08:56:51 2018 -0700

meson: Don't compile pipe loader with dri support when not using dri

Corrects building glx as gallium-xlib without any dri targets.

v2: - fix ugly formatting

Fixes: 66c94b9313a697ce8f2b222f4ba353035e4b8726
       ("meson: build gallium winsys for dri, null, and wrapper")

Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
(cherry picked from commit 5dcb77e491c9416b83f568d2fda0281749ce26e2)

---

 src/gallium/auxiliary/pipe-loader/meson.build | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build
index 32e8188c68..c0b9a53cf6 100644
--- a/src/gallium/auxiliary/pipe-loader/meson.build
+++ b/src/gallium/auxiliary/pipe-loader/meson.build
@@ -31,6 +31,9 @@ libpipe_loader_defines = []
 if dep_libdrm.found()
   files_pipe_loader += files('pipe_loader_drm.c')
 endif
+if with_dri
+  libpipe_loader_defines += '-DHAVE_PIPE_LOADER_DRI'
+endif
 if with_gallium_drisw_kms
   libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS'
 endif
@@ -42,10 +45,7 @@ libpipe_loader_static = static_library(
     inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux,
     inc_gallium_winsys,
   ],
-  c_args : [
-    c_vis_args, '-DHAVE_PIPE_LOADER_DRI', '-DGALLIUM_STATIC_TARGETS=1',
-    libpipe_loader_defines,
-  ],
+  c_args : [c_vis_args, libpipe_loader_defines, '-DGALLIUM_STATIC_TARGETS=1'],
   link_with : [libloader, libxmlconfig],
   dependencies : [dep_libdrm],
   build_by_default : false,
@@ -59,7 +59,7 @@ libpipe_loader_dynamic = static_library(
     inc_gallium_winsys,
   ],
   c_args : [
-    c_vis_args, libpipe_loader_defines, '-DHAVE_PIPE_LOADER_DRI',
+    c_vis_args, libpipe_loader_defines,
     '-DPIPE_SEARCH_DIR="@0@"'.format(
       join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe')
     )