fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-06-03 08:18:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/meson.build: disable nouveau tests for static build

Browse source 
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
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
This commit is contained in:
Peter Seiderer 2019-11-25 15:59:15 +01:00
parent 991e95fd13
commit 1e111dba36
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/meson.build
View file

@ -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(