From 2621484037869c917621b9f961310f13c09fcc00 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Mon, 11 Mar 2024 09:06:55 -0500 Subject: egl: Disable symbols check for static builds The symbols check only works for dynamic libraries. When building statically, the test fails. This is caused by the check filtering out non-dynamic symbols with nm. This change skips the check when building only static libraries. Signed-off-by: Jordan Williams --- egl/meson.build | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/egl/meson.build b/egl/meson.build index 5c62ac1..5363e80 100644 --- a/egl/meson.build +++ b/egl/meson.build @@ -13,16 +13,21 @@ if get_option('tests') wayland_egl_abi_check = executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c') test('wayland-egl abi check', wayland_egl_abi_check) - nm_path = find_program(['llvm-nm', 'nm']).full_path() - - test( - 'wayland-egl symbols check', - find_program('wayland-egl-symbols-check'), - env: [ - 'WAYLAND_EGL_LIB=@0@'.format(wayland_egl.full_path()), - 'NM=@0@'.format(nm_path) - ] - ) + if get_option('default_library') != 'static' + nm_path = find_program(['llvm-nm', 'nm']).full_path() + wayland_egl_shared = wayland_egl + if get_option('default_library') == 'both' + wayland_egl_shared = wayland_egl.get_shared_lib() + endif + test( + 'wayland-egl symbols check', + find_program('wayland-egl-symbols-check'), + env: [ + 'WAYLAND_EGL_LIB=@0@'.format(wayland_egl_shared.full_path()), + 'NM=@0@'.format(nm_path) + ] + ) + endif endif install_headers([ -- cgit v1.2.3