diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2019-05-07 10:26:57 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2019-05-07 10:26:57 +0000 |
| commit | 0ff97045b88d50d1ab7fd1198c205bb2270896bf (patch) | |
| tree | b980b0fffdb6726a9f96441e7c69b7dba1a6f304 /gio | |
| parent | b17436d952f5ad682dfe98e0eca7bc31705cf776 (diff) | |
| parent | c6342b975d644d943e23b02de92687e3870e7708 (diff) | |
| download | glib-0ff97045b88d50d1ab7fd1198c205bb2270896bf.tar.gz | |
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
Diffstat (limited to 'gio')
| -rw-r--r-- | gio/tests/meson.build | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gio/tests/meson.build b/gio/tests/meson.build index 8030e5ae2..98e802ac6 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -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, ) |