diff options
| author | Eric Engestrom <[email protected]> | 2018-10-11 14:40:28 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-07-10 11:27:51 +0000 |
| commit | 1172263c87232d9af5f35a8ea27705c4afb3b8a6 (patch) | |
| tree | 0e60b738d657f8aaf2a81303e744eaac124a1123 /src | |
| parent | 176f350fcf1d3024482c0307d2ce9eec836ad487 (diff) | |
egl: use new symbols check script
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by Dylan Baker <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r--[-rwxr-xr-x] | src/egl/egl-symbols.txt (renamed from src/egl/egl-symbols-check) | 24 | ||||
| -rw-r--r-- | src/egl/meson.build | 16 |
2 files changed, 10 insertions, 30 deletions
diff --git a/src/egl/egl-symbols-check b/src/egl/egl-symbols.txt index 4200f9c07f3..0b1929ae6a8 100755..100644 --- a/src/egl/egl-symbols-check +++ b/src/egl/egl-symbols.txt @@ -1,20 +1,3 @@ -#!/bin/sh -set -eu - -if [ "$(uname)" = "Darwin" ] -then - LIB=${1-.libs/libEGL.dylib} -else - LIB=${1-.libs/libEGL.so} -fi - -if ! [ -f "$LIB" ] -then - exit 1 -fi - -FUNCS=$($NM -D --defined-only $LIB | grep -o "T .*" | cut -c 3- | while read func; do -( grep -q "^$func$" || echo $func ) <<EOF eglBindAPI eglBindTexImage eglChooseConfig @@ -61,10 +44,3 @@ eglWaitNative eglWaitSync MesaGLInteropEGLQueryDeviceInfo MesaGLInteropEGLExportObject -_fini -_init -EOF -done) - -test ! -n "$FUNCS" || echo $FUNCS -test ! -n "$FUNCS" diff --git a/src/egl/meson.build b/src/egl/meson.build index 97d79823b66..a6b66a06857 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -196,13 +196,17 @@ if with_tests and prog_nm.found() if with_glvnd # TODO: add glvnd symbol check else - test('egl-symbols-check', - find_program('egl-symbols-check'), - env : env_test, - args : libegl, - suite : ['egl'], - ) + egl_symbols = files('egl-symbols.txt') endif + test('egl-symbols-check', + symbols_check, + args : [ + '--lib', libegl, + '--symbols-file', egl_symbols, + '--nm', prog_nm.path(), + ], + suite : ['egl'], + ) test('egl-entrypoint-check', find_program('egl-entrypoint-check'), env : ['srcdir=' + meson.current_source_dir()], |