From d38b5d92ee66b0243fd5ea6d8fdf58a456e3a5f4 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Thu, 9 Jul 2020 17:04:28 +0200 Subject: [PATCH] shared/nm-glib-aux: don't use RTLD_DEEPBIND on musl [thaller@redhat.com: original patch modified] --- shared/nm-glib-aux/nm-json-aux.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/shared/nm-glib-aux/nm-json-aux.c b/shared/nm-glib-aux/nm-json-aux.c index 4212e6282c..595ff2b277 100644 --- a/shared/nm-glib-aux/nm-json-aux.c +++ b/shared/nm-glib-aux/nm-json-aux.c @@ -11,6 +11,16 @@ /*****************************************************************************/ +/* If RTLD_DEEPBIND isn't available just ignore it. This can cause problems + * with jansson, json-glib, and cjson symbols clashing (and as such crashing the + * program). But that needs to be fixed by the json libraries, and it is by adding + * symbol versioning in recent versions. */ +#ifndef RTLD_DEEPBIND + #define RTLD_DEEPBIND 0 +#endif + +/*****************************************************************************/ + static void _gstr_append_string_len(GString *gstr, const char *str, gsize len) {