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

gmodule/meson: Use stdout to communicate return value pf dlsym test code

Browse Source
This commit is contained in:
Marco Trevisan (Treviño) 2022-10-24 20:36:26 +02:00
parent 4a33e2a176
commit 98059d088f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gmodule/meson.build
View File

@ -28,11 +28,11 @@ if g_module_impl == 'G_MODULE_IMPL_DL'
message('Building for MSVC: assuming that symbols are prefixed with underscore') message('Building for MSVC: assuming that symbols are prefixed with underscore')
g_module_need_uscore = 1 g_module_need_uscore = 1
elif meson.can_run_host_binaries() elif meson.can_run_host_binaries()
# FIXME: communicate result via stdout instead of return value, so non-0 return is not printed in bold red
rres = cc.run(dlopen_dlsym_test_code, rres = cc.run(dlopen_dlsym_test_code,
dependencies : libdl_dep, dependencies : libdl_dep,
name : 'dlsym() preceding underscores') name : 'dlsym() preceding underscores')
if host_system == 'windows' or (rres.compiled() and rres.returncode() == 0) if host_system == 'windows' or (rres.compiled() and
rres.returncode() == 0 and rres.stdout().to_int() == 0)
g_module_need_uscore = 1 g_module_need_uscore = 1
endif endif
else else

5
meson.build
View File

@ -899,6 +899,8 @@ endif
dlopen_dlsym_test_code = ''' dlopen_dlsym_test_code = '''
#include <dlfcn.h> #include <dlfcn.h>
#include <stdio.h>
int r;
int glib_underscore_test (void) { return 42; } int glib_underscore_test (void) { return 42; }
int main (int argc, char ** argv) { int main (int argc, char ** argv) {
void *f1 = (void*)0, *f2 = (void*)0, *handle; void *f1 = (void*)0, *f2 = (void*)0, *handle;
@ -907,7 +909,8 @@ int main (int argc, char ** argv) {
f1 = dlsym (handle, "glib_underscore_test"); f1 = dlsym (handle, "glib_underscore_test");
f2 = dlsym (handle, "_glib_underscore_test"); f2 = dlsym (handle, "_glib_underscore_test");
} }
return (!f2 || f1); r = (!f2 || f1) ? puts ("1") : puts ("0");
return r > 0 ? 0 : r;
}''' }'''
libdl_dep = [] libdl_dep = []
if cc.links(dlopen_dlsym_test_code, name : 'dlopen() and dlsym() in system libraries') if cc.links(dlopen_dlsym_test_code, name : 'dlopen() and dlsym() in system libraries')