Module: Mesa Branch: master Commit: 64f17440b65b3065ba3d14155cd3da831200e49c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=64f17440b65b3065ba3d14155cd3da831200e49c
Author: Eric Engestrom <eric.engest...@imgtec.com> Date: Mon Oct 30 15:43:10 2017 +0000 automake+meson: don't run egl symbol check on libglvnd lib We might want to add a symbol check for the glvnd variant though. Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> --- src/egl/Makefile.am | 9 +++++++-- src/egl/meson.build | 12 ++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index eeb745f973..eaec4ff946 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -201,8 +201,13 @@ egl_HEADERS = \ $(top_srcdir)/include/EGL/eglmesaext.h \ $(top_srcdir)/include/EGL/eglplatform.h -TESTS = egl-symbols-check \ - egl-entrypoint-check +TESTS = egl-entrypoint-check + +if USE_LIBGLVND +#TODO: glvnd symbol check +else +TESTS += egl-symbols-check +endif EXTRA_DIST = \ $(TESTS) \ diff --git a/src/egl/meson.build b/src/egl/meson.build index 254e7e7a17..67ca8cef92 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -183,10 +183,14 @@ pkg.generate( ) if with_tests - test('egl-symbols-check', - find_program('egl-symbols-check'), - args : libegl - ) + if with_glvnd + # TODO: add glvnd symbol check + else + test('egl-symbols-check', + find_program('egl-symbols-check'), + args : libegl + ) + endif test('egl-entrypoint-check', find_program('egl-entrypoint-check'), env : [ 'srcdir=' + meson.current_source_dir() ] _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit