Merge branch '1739-freebsd-too' into 'master'

tests: Don’t check for libdl on FreeBSD or NetBSD either

Closes #1739

See merge request GNOME/glib!810
This commit is contained in:
Philip Withnall 2019-05-07 10:26:57 +00:00
commit 0ff97045b8

View File

@ -140,13 +140,17 @@ if host_machine.system() != 'windows'
}
if have_rtld_next
# FIXME: This list will probably grow; see
# https://gitlab.gnome.org/GNOME/glib/issues/1739
no_libdl_systems = ['freebsd', 'netbsd', 'openbsd']
gio_tests += {
'gsocketclient-slow' : {
'depends' : [
shared_library('slow-connect-preload',
'slow-connect-preload.c',
name_prefix : '',
dependencies: cc.find_library('dl', required: host_machine.system() != 'openbsd'),
dependencies: cc.find_library('dl', required: not no_libdl_systems.contains(host_machine.system())),
install_dir : installed_tests_execdir,
install: installed_tests_enabled,
)