[Mesa-dev] [PATCH mesa 07/11] automake+meson: don't run egl symbol check on libglvnd lib

Eric Engestrom eric.engestrom at imgtec.com
Tue Oct 31 11:20:04 UTC 2017


We might want to add a symbol check for the glvnd variant though.

Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.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 eeb745f973a98f253379..eaec4ff946fdd7891e7d 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 254e7e7a1778a5abc654..67ca8cef9218d6e9218a 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() ]
-- 
Cheers,
  Eric



More information about the mesa-dev mailing list