luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/tests/meson.build
View File

@ -140,13 +140,17 @@ if host_machine.system() != 'windows'
} }
if have_rtld_next 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 += { gio_tests += {
'gsocketclient-slow' : { 'gsocketclient-slow' : {
'depends' : [ 'depends' : [
shared_library('slow-connect-preload', shared_library('slow-connect-preload',
'slow-connect-preload.c', 'slow-connect-preload.c',
name_prefix : '', 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_dir : installed_tests_execdir,
install: installed_tests_enabled, install: installed_tests_enabled,
) )