Mesa (master): meson: don' t build gallium dri target if gallium is disabled
Dylan Baker
dbaker at kemper.freedesktop.org
Thu Oct 19 22:18:28 UTC 2017
Module: Mesa
Branch: master
Commit: a447f9fe7b7902db6f91bd4b24adb4ddfad4b10b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a447f9fe7b7902db6f91bd4b24adb4ddfad4b10b
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Thu Oct 19 10:28:37 2017 -0700
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 at intel.com>
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
Tested-by: Rafael Antognolli <rafael.antognolli at intel.com>
Reviewed-by: Lyude Paul <lyude at redhat.com>
---
src/gallium/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index a65b32c658..97347819d6 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
More information about the mesa-commit
mailing list