From: Dylan Baker <dylan@pnwbakers.com>
Date: Thu, 19 Oct 2017 17:28:37 +0000 (-0700)
Subject: meson: don't build gallium dri target if gallium is disabled
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a447f9fe7b7902db6f91bd4b24adb4ddfad4b10b;p=mesa.git

meson: don't build gallium dri target if gallium is disabled

Otherwise -Dgallium-drivers= will cause libmesa_gallium to be built and
the megadriver install script to attempt to install drivers without any
actual drivers being built.

fixes: 66f97f6640f5316b36177fd1053f0027eb6ec6cc ("meson: build radeonsi")
Reported-by: Rafael Antognolli <rafael.antognolli@intel.com>
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Tested-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
---

diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index a65b32c658e..97347819d60 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -67,7 +67,7 @@ subdir('state_trackers/dri')
 # TODO: virgl
 # TODO: winsys/sw/xlib
 # TODO: clover
-if with_dri
+if with_dri and with_gallium
   subdir('targets/dri')
 endif
 # TODO: xlib-glx