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

[GitLab Mirror]

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

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

autotools: 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/Makefile.am | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index daaf46ddb23..69978e7a468 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -175,6 +175,8 @@ glapi_test_LDADD = \
 endif
 endif
 
+if USE_LIBGLVND
+else
 if HAVE_OPENGL_ES1
 TESTS += es1api/ABI-check
 
@@ -207,12 +209,15 @@ es1api_libGLESv1_CM_la_LDFLAGS = \
 	$(LD_NO_UNDEFINED)
 
 es1api_libGLESv1_CM_la_LIBADD += shared-glapi/libglapi.la
-endif
+endif # HAVE_OPENGL_ES1
+endif # USE_LIBGLVND
 
 es1api/glapi_mapi_tmp.h: $(glapi_gen_mapi_deps)
 	$(MKDIR_GEN)
 	$(glapi_gen_mapi) glesv1 $(glapi_gen_gl_xml) > $@
 
+if USE_LIBGLVND
+else
 if HAVE_OPENGL_ES2
 TESTS += es2api/ABI-check
 
@@ -251,7 +256,8 @@ es2api_libGLESv2_la_LDFLAGS = \
 	$(LD_NO_UNDEFINED)
 
 es2api_libGLESv2_la_LIBADD += shared-glapi/libglapi.la
-endif
+endif # HAVE_OPENGL_ES2
+endif # USE_LIBGLVND
 
 es2api/glapi_mapi_tmp.h: $(glapi_gen_mapi_deps)
 	$(MKDIR_GEN)