1*4882a593SmuzhiyunFrom c9036706b9f724f09ac6288f82b53f2e76264ec7 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Peter Seiderer <ps.report@gmx.net> 3*4882a593SmuzhiyunDate: Mon, 25 Nov 2019 15:59:15 +0100 4*4882a593SmuzhiyunSubject: [PATCH] tests/meson.build: disable nouveau tests for static build 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Peter Seiderer <ps.report@gmx.net> 7*4882a593Smuzhiyun--- 8*4882a593SmuzhiyunNotes: 9*4882a593Smuzhiyun 10*4882a593Smuzhiyun - the existing test/check for static build in meson.build does not 11*4882a593Smuzhiyun catch this case because e.g. the buildroot toolchain 12*4882a593Smuzhiyun br-arm-full-static-2019.05.1 provides an empty libdl.a 13*4882a593Smuzhiyun 14*4882a593Smuzhiyun 169 # Among others FreeBSD does not have a separate dl library. 15*4882a593Smuzhiyun 170 if not cc.has_function('dlsym') 16*4882a593Smuzhiyun 171 dep_dl = cc.find_library('dl', required : with_nouveau) 17*4882a593Smuzhiyun 172 else 18*4882a593Smuzhiyun 173 dep_dl = [] 19*4882a593Smuzhiyun 174 endif 20*4882a593Smuzhiyun--- 21*4882a593Smuzhiyun tests/meson.build | 5 ++++- 22*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 1 deletion(-) 23*4882a593Smuzhiyun 24*4882a593Smuzhiyundiff --git a/tests/meson.build b/tests/meson.build 25*4882a593Smuzhiyunindex 6c8ddd9..f7cb5f0 100644 26*4882a593Smuzhiyun--- a/tests/meson.build 27*4882a593Smuzhiyun+++ b/tests/meson.build 28*4882a593Smuzhiyun@@ -44,8 +44,11 @@ endif 29*4882a593Smuzhiyun if with_etnaviv 30*4882a593Smuzhiyun subdir('etnaviv') 31*4882a593Smuzhiyun endif 32*4882a593Smuzhiyun+lib_type = get_option('default_library') 33*4882a593Smuzhiyun if with_nouveau 34*4882a593Smuzhiyun- subdir('nouveau') 35*4882a593Smuzhiyun+ if lib_type != 'static' 36*4882a593Smuzhiyun+ subdir('nouveau') 37*4882a593Smuzhiyun+ endif 38*4882a593Smuzhiyun endif 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun drmsl = executable( 41*4882a593Smuzhiyun-- 42*4882a593Smuzhiyun2.24.0 43*4882a593Smuzhiyun 44