luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cygwin-rtld_next' into 'master'

Browse Source 
Check for RTLD_NEXT

See merge request GNOME/glib!750
This commit is contained in:
Philip Withnall 2019-03-27 16:25:48 +00:00
commit ad614fc070
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gio/tests/meson.build
View File

@ -136,27 +136,32 @@ if host_machine.system() != 'windows'
'unix-mounts' : {}, 'unix-mounts' : {},
'unix-streams' : {}, 'unix-streams' : {},
'g-file-info-filesystem-readonly' : {}, 'g-file-info-filesystem-readonly' : {},
'gsocketclient-slow' : {
'depends' : [
shared_library('slow-connect-preload',
'slow-connect-preload.c',
name_prefix : '',
dependencies: cc.find_library('dl'),
install_dir : installed_tests_execdir,
install: installed_tests_enabled,
)
],
'env' : {
'LD_PRELOAD': '@0@/slow-connect-preload.so'.format(meson.current_build_dir())
},
'installed_tests_env' : {
'LD_PRELOAD': '@0@/slow-connect-preload.so'.format(installed_tests_execdir),
},
},
'gschema-compile' : {'install' : false}, 'gschema-compile' : {'install' : false},
'trash' : {}, 'trash' : {},
} }
if have_rtld_next
gio_tests += {
'gsocketclient-slow' : {
'depends' : [
shared_library('slow-connect-preload',
'slow-connect-preload.c',
name_prefix : '',
dependencies: cc.find_library('dl'),
install_dir : installed_tests_execdir,
install: installed_tests_enabled,
)
],
'env' : {
'LD_PRELOAD': '@0@/slow-connect-preload.so'.format(meson.current_build_dir())
},
'installed_tests_env' : {
'LD_PRELOAD': '@0@/slow-connect-preload.so'.format(installed_tests_execdir),
},
},
}
endif
# Uninstalled because of the check-for-executable logic in DesktopAppInfo # Uninstalled because of the check-for-executable logic in DesktopAppInfo
# unable to find the installed executable # unable to find the installed executable
if not glib_have_cocoa if not glib_have_cocoa

6
meson.build
View File

@ -592,6 +592,12 @@ if cc.has_header_symbol('dlfcn.h', 'RTLD_GLOBAL')
glib_conf.set('HAVE_RTLD_GLOBAL', 1) glib_conf.set('HAVE_RTLD_GLOBAL', 1)
endif endif
have_rtld_next = false
if cc.has_header_symbol('dlfcn.h', 'RTLD_NEXT')
have_rtld_next = true
glib_conf.set('HAVE_RTLD_NEXT', 1)
endif
# Check whether to use statfs or statvfs # Check whether to use statfs or statvfs
# Some systems have both statfs and statvfs, pick the most "native" for these # Some systems have both statfs and statvfs, pick the most "native" for these
if have_func_statfs and have_func_statvfs if have_func_statfs and have_func_statvfs