Mesa (staging/18.3): meson: fix wayland-less builds

[GitLab Mirror]

Module: Mesa
Branch: staging/18.3
Commit: fbe2a549913784fb4c2b3bb2fe73809807d134f8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fbe2a549913784fb4c2b3bb2fe73809807d134f8

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Thu Oct 11 16:00:04 2018 +0100

meson: fix wayland-less builds

Those empty variables in the !wayland case are useless and running that
meson.build with them breaks the build:

  [287/850] Generating wayland-drm-client-protocol.h with a custom command.
  FAILED: src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
  client-header ../src/egl/wayland/wayland-drm/wayland-drm.xml src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
  /bin/sh: client-header: command not found
  ninja: build stopped: subcommand failed.

Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver"
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
(cherry picked from commit 4fa2fb35245448f8b5d81fb5b37afec4f343f18a)

---

 meson.build     | 7 -------
 src/meson.build | 4 +++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 58ff3ea973..1b47587782 100644
--- a/meson.build
+++ b/meson.build
@@ -1318,13 +1318,6 @@ if with_platform_wayland
     'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
   )
   pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']
-else
-  prog_wl_scanner = []
-  wl_scanner_arg = ''
-  dep_wl_protocols = null_dep
-  dep_wayland_client = null_dep
-  dep_wayland_server = null_dep
-  wayland_dmabuf_xml = ''
 endif
 
 dep_x11 = null_dep
diff --git a/src/meson.build b/src/meson.build
index 2c0bff7343..0d0ecf2c53 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -51,7 +51,9 @@ subdir('util')
 subdir('mapi')
 # TODO: opengl
 subdir('compiler')
-subdir('egl/wayland/wayland-drm')
+if with_platform_wayland
+  subdir('egl/wayland/wayland-drm')
+endif
 if with_any_vk
   subdir('vulkan')
 endif