OSDN Git Service

automake+meson: don't run egl symbol check on libglvnd lib
authorEric Engestrom <eric.engestrom@imgtec.com>
Mon, 30 Oct 2017 15:43:10 +0000 (15:43 +0000)
committerEric Engestrom <eric.engestrom@imgtec.com>
Tue, 31 Oct 2017 17:59:49 +0000 (17:59 +0000)
We might want to add a symbol check for the glvnd variant though.

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
src/egl/Makefile.am
src/egl/meson.build

index eeb745f..eaec4ff 100644 (file)
@@ -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) \
index 254e7e7..67ca8ce 100644 (file)
@@ -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() ]