diff options
| author | Eric Engestrom <eric.engestrom@imgtec.com> | 2017-10-30 15:43:10 +0000 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@imgtec.com> | 2017-10-31 17:59:49 +0000 |
| commit | 64f17440b65b3065ba3d14155cd3da831200e49c (patch) | |
| tree | 8dcdf8ef336246e0cf68a990e903005d917a2bc8 | |
| parent | 1946de2b71b08cd60e6a108cf642d82086be8236 (diff) | |
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.engestrom@imgtec.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | src/egl/Makefile.am | 9 | ||||
| -rw-r--r-- | 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() ] |