[PATCH wayland v2 1/4] Revert "wayland-egl-symbols-check: pass the DSO name via the build system"

Emil Velikov emil.l.velikov at gmail.com
Wed Feb 28 16:38:18 UTC 2018


This reverts commit 85cb5ed64aa8246f4da93fc5b76dfc34096bf803.

It seems like we've misread the existing code - the DSO name can be
propagated via the build-system. The one available in the script was a
simple fall-back.

v2: Rebase on top of $NM patch.

Cc: Daniel Stone <daniels at collabora.com>
---
 Makefile.am                   | 1 -
 egl/wayland-egl-symbols-check | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2731ee7..d5b3d79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -196,7 +196,6 @@ AM_TESTS_ENVIRONMENT =							\
 	export WAYLAND_SCANNER='$(top_builddir)/wayland-scanner'	\
 	TEST_DATA_DIR='$(top_srcdir)/tests/data'			\
 	TEST_OUTPUT_DIR='$(top_builddir)/tests/output'			\
-	WAYLAND_EGL_LIB='$(top_builddir)/egl/.libs/libwayland-egl.so'	\
 	SED=$(SED)							\
 	;
 
diff --git a/egl/wayland-egl-symbols-check b/egl/wayland-egl-symbols-check
index 6ad28f3..e247cf3 100755
--- a/egl/wayland-egl-symbols-check
+++ b/egl/wayland-egl-symbols-check
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-FUNCS=$($NM -D --defined-only ${WAYLAND_EGL_LIB} | grep -o "T .*" | cut -c 3- | while read func; do
+FUNCS=$($NM -D --defined-only ${1-.libs/libwayland-egl.so} | grep -o "T .*" | cut -c 3- | while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 wl_egl_window_resize
 wl_egl_window_create
-- 
2.16.0



More information about the wayland-devel mailing list