Mesa (master): meson: don't build libGLES*.so with GLVND

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b01524fff05eef66e8cd24f1c5aacefed4209f03
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b01524fff05eef66e8cd24f1c5aacefed4209f03

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Tue Mar  5 11:46:38 2019 +0000

meson: don't build libGLES*.so with GLVND

GLVND already provides these, so distro packagers have been deleting
them all along. Let's save ourselves the trouble and not build them in
the first place.

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>


---

 src/mapi/meson.build | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/mapi/meson.build b/src/mapi/meson.build
index 3e79bbaa7aa..8b1b7ba8f73 100644
--- a/src/mapi/meson.build
+++ b/src/mapi/meson.build
@@ -33,9 +33,11 @@ subdir('glapi')
 if with_shared_glapi
   subdir('shared-glapi')
 endif
-if with_gles1
-  subdir('es1api')
-endif
-if with_gles2
-  subdir('es2api')
+if not with_glvnd
+  if with_gles1
+    subdir('es1api')
+  endif
+  if with_gles2
+    subdir('es2api')
+  endif
 endif