[PATCH wayland 3/6] Revert "wayland-egl-symbols-check: pass the DSO name via the build system"
Emil Velikov
emil.l.velikov at gmail.com
Thu Feb 15 18:50:14 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.
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 322d6b8..7f24ca5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -192,7 +192,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 e107362..e7105ea 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