[glib/wip/meson] meson: Fix the build defining HAVE_RTLD_X
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/meson] meson: Fix the build defining HAVE_RTLD_X
- Date: Fri, 23 Jun 2017 16:54:32 +0000 (UTC)
commit 9748f5ffbb4c5c2f7c8660582fbb55b5ec302378
Author: Thibault Saunier <thibault saunier osg samsung com>
Date: Fri Jun 23 12:36:38 2017 -0400
meson: Fix the build defining HAVE_RTLD_X
Otherwise RTLD_XXX get redefined.
https://bugzilla.gnome.org/show_bug.cgi?id=784133
config.h.meson | 3 +++
meson.build | 12 ++++++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/config.h.meson b/config.h.meson
index 7346b92..a3d090e 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -796,3 +796,6 @@
#mesondefine MAJOR_IN_MKDEV
#mesondefine MAJOR_IN_SYSMACROS
+#mesondefine HAVE_RTLD_LAZY
+#mesondefine HAVE_RTLD_NOW
+#mesondefine HAVE_RTLD_GLOBAL
diff --git a/meson.build b/meson.build
index 892a7ce..9938991 100644
--- a/meson.build
+++ b/meson.build
@@ -369,6 +369,18 @@ elif cc.has_header_symbol('sys/mkdev.h', 'major')
glib_conf.set('MAJOR_IN_MKDEV', 1)
endif
+if cc.has_header_symbol('dlfcn.h', 'RTLD_LAZY')
+ glib_conf.set('HAVE_RTLD_LAZY', 1)
+endif
+
+if cc.has_header_symbol('dlfcn.h', 'RTLD_NOW')
+ glib_conf.set('HAVE_RTLD_NOW', 1)
+endif
+
+if cc.has_header_symbol('dlfcn.h', 'RTLD_GLOBAL')
+ glib_conf.set('HAVE_RTLD_GLOBAL', 1)
+endif
+
# Check whether to use statfs or statvfs
# Some systems have both statfs and statvfs, pick the most "native" for these
if have_func_statfs and have_func_statvfs
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]