From 35fa20f1fd477b600c756dbeee1008c6a929a368 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Wed, 23 Oct 2019 23:32:54 +0100
Subject: [PATCH] libkms: convert to new symbols check

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---
 libkms/kms-symbol-check | 27 ---------------------------
 libkms/kms-symbols.txt  |  8 ++++++++
 libkms/meson.build      | 11 +++++++----
 3 files changed, 15 insertions(+), 31 deletions(-)
 delete mode 100755 libkms/kms-symbol-check
 create mode 100644 libkms/kms-symbols.txt

diff --git a/libkms/kms-symbol-check b/libkms/kms-symbol-check
deleted file mode 100755
index 7d3426f6..00000000
--- a/libkms/kms-symbol-check
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-set -u
-
-# The following symbols (past the first five) are taken from the public headers.
-# A list of the latter should be available Makefile.sources/LIBKMS_H_FILES
-
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libkms.so} | awk '{print $3}'| while read func; do
-( grep -q "^$func$" || echo $func )  <<EOF
-__bss_start
-_edata
-_end
-_fini
-_init
-kms_bo_create
-kms_bo_destroy
-kms_bo_get_prop
-kms_bo_map
-kms_bo_unmap
-kms_create
-kms_destroy
-kms_get_prop
-EOF
-done)
-
-test ! -n "$FUNCS" || echo $FUNCS
-test ! -n "$FUNCS"
diff --git a/libkms/kms-symbols.txt b/libkms/kms-symbols.txt
new file mode 100644
index 00000000..e0ba8c91
--- /dev/null
+++ b/libkms/kms-symbols.txt
@@ -0,0 +1,8 @@
+kms_bo_create
+kms_bo_destroy
+kms_bo_get_prop
+kms_bo_map
+kms_bo_unmap
+kms_create
+kms_destroy
+kms_get_prop
diff --git a/libkms/meson.build b/libkms/meson.build
index 04f018af..216be4df 100644
--- a/libkms/meson.build
+++ b/libkms/meson.build
@@ -68,8 +68,11 @@ pkg.generate(
 )
 
 test(
-  'kms-symbol-check',
-  find_program('kms-symbol-check'),
-  env : env_test,
-  args : libkms,
+  'kms-symbols-check',
+  symbols_check,
+  args : [
+    '--lib', libkms,
+    '--symbols-file', files('kms-symbols.txt'),
+    '--nm', prog_nm.path(),
+  ],
 )