luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gmodule – Check for RTLD_LAZY and others in configure

Browse Source 
They are no #defines on Android but enum values, and on 64 bit Android
they have different values than what we would otherwise fall-back to.

https://bugzilla.gnome.org/show_bug.cgi?id=776876
This commit is contained in:
Sebastian Dröge 2017-01-04 21:39:48 +02:00
parent 83c1b881fb
commit cc5e9f2362
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -1489,6 +1489,16 @@ dnl *** check whether we need preceeding underscores
G_MODULE_NEED_USCORE=0 G_MODULE_NEED_USCORE=0
fi fi
AC_CHECK_DECL([RTLD_LAZY],
[AC_DEFINE(HAVE_RTLD_LAZY, 1, [Define to 1 if RTLD_LAZY is available])],
[], [[#include <dlfcn.h>]])
AC_CHECK_DECL([RTLD_NOW],
[AC_DEFINE(HAVE_RTLD_NOW, 1, [Define to 1 if RTLD_NOW is available])],
[], [[#include <dlfcn.h>]])
AC_CHECK_DECL([RTLD_GLOBAL],
[AC_DEFINE(HAVE_RTLD_GLOBAL, 1, [Define to 1 if RTLD_GLOBAL is available])],
[], [[#include <dlfcn.h>]])
LDFLAGS="$LDFLAGS_orig" LDFLAGS="$LDFLAGS_orig"
dnl *** check for having dlerror() dnl *** check for having dlerror()
AC_CHECK_FUNC(dlerror, AC_CHECK_FUNC(dlerror,

7
gmodule/gmodule-dl.c
View File

@ -57,17 +57,18 @@
* RTLD_GLOBAL - the external symbols defined in the library will be made * RTLD_GLOBAL - the external symbols defined in the library will be made
* available to subsequently loaded libraries. * available to subsequently loaded libraries.
*/ */
#ifndef RTLD_LAZY #ifndef HAVE_RTLD_LAZY
#define RTLD_LAZY 1 #define RTLD_LAZY 1
#endif /* RTLD_LAZY */ #endif /* RTLD_LAZY */
#ifndef RTLD_NOW #ifndef HAVE_RTLD_NOW
#define RTLD_NOW 0 #define RTLD_NOW 0
#endif /* RTLD_NOW */ #endif /* RTLD_NOW */
/* some systems (OSF1 V5.0) have broken RTLD_GLOBAL linkage */ /* some systems (OSF1 V5.0) have broken RTLD_GLOBAL linkage */
#ifdef G_MODULE_BROKEN_RTLD_GLOBAL #ifdef G_MODULE_BROKEN_RTLD_GLOBAL
#undef RTLD_GLOBAL #undef RTLD_GLOBAL
#undef HAVE_RTLD_GLOBAL
#endif /* G_MODULE_BROKEN_RTLD_GLOBAL */ #endif /* G_MODULE_BROKEN_RTLD_GLOBAL */
#ifndef RTLD_GLOBAL #ifndef HAVE_RTLD_GLOBAL
#define RTLD_GLOBAL 0 #define RTLD_GLOBAL 0
#endif /* RTLD_GLOBAL */ #endif /* RTLD_GLOBAL */