From 1e111dba362ececb00dddf52e95a38ab46993c36 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 25 Nov 2019 15:59:15 +0100 Subject: [PATCH] tests/meson.build: disable nouveau tests for static build Signed-off-by: Peter Seiderer --- Notes: - the existing test/check for static build in meson.build does not catch this case because e.g. the buildroot toolchain br-arm-full-static-2019.05.1 provides an empty libdl.a 169 # Among others FreeBSD does not have a separate dl library. 170 if not cc.has_function('dlsym') 171 dep_dl = cc.find_library('dl', required : with_nouveau) 172 else 173 dep_dl = [] 174 endif Changes v1 -> v2: - re-based on master - re-opened new merge request as original one !29 was closed/patch was squased into merge request !28 which was declined, but similar/same was merged later with !139 (commit 52f05d3d), so re-send this remaining fix as new merge request --- tests/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 196edbfa..732e5b1b 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -44,8 +44,12 @@ endif if with_etnaviv subdir('etnaviv') endif +lib_type = get_option('default_library') if with_nouveau - subdir('nouveau') + # the nouveau test uses dlsym() making it incompatible with static linking + if lib_type != 'static' + subdir('nouveau') + endif endif drmsl = executable(