0002-tests-meson.build-disable-nouveau-tests-for-static-b.patch 1.1 KB

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