From 1172263c87232d9af5f35a8ea27705c4afb3b8a6 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Thu, 11 Oct 2018 14:40:28 +0100
Subject: [PATCH] egl: use new symbols check script

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
 .../{egl-symbols-check => egl-symbols.txt}    | 24 -------------------
 src/egl/meson.build                           | 16 ++++++++-----
 2 files changed, 10 insertions(+), 30 deletions(-)
 rename src/egl/{egl-symbols-check => egl-symbols.txt} (69%)
 mode change 100755 => 100644

diff --git a/src/egl/egl-symbols-check b/src/egl/egl-symbols.txt
old mode 100755
new mode 100644
similarity index 69%
rename from src/egl/egl-symbols-check
rename to src/egl/egl-symbols.txt
index 4200f9c07f3..0b1929ae6a8
--- 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()],
-- 
2.30.2