[tracker/wip/carlosg/remote-module-extension] libtracker-sparql: Use G_MODULE_SUFFIX on remote module loading
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/carlosg/remote-module-extension] libtracker-sparql: Use G_MODULE_SUFFIX on remote module loading
- Date: Sun, 20 Mar 2022 23:01:46 +0000 (UTC)
commit 6ad396af490c070e7936a550cb114a3f3a7ef75c
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Mar 20 23:46:58 2022 +0100
libtracker-sparql: Use G_MODULE_SUFFIX on remote module loading
Other platforms use different suffixes for these dynamically loaded
modules. We should use G_MODULE_SUFFIX to handle the suffixes for
the platforms supported by GLib.
Fixes: https://gitlab.gnome.org/GNOME/tracker/-/issues/357
src/libtracker-sparql/tracker-remote-module.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/libtracker-sparql/tracker-remote-module.c b/src/libtracker-sparql/tracker-remote-module.c
index 2ca0fd181..bd6ed1146 100644
--- a/src/libtracker-sparql/tracker-remote-module.c
+++ b/src/libtracker-sparql/tracker-remote-module.c
@@ -6,7 +6,7 @@
#include <tracker-sparql.h>
#include <dlfcn.h>
-#define LIBSOUP_2_SONAME "libsoup-2.4.so.1"
+#define LIBSOUP_2_SONAME "libsoup-2.4." G_MODULE_SUFFIX
static gboolean initialized = FALSE;
@@ -34,12 +34,12 @@ tracker_init_remote (void)
#ifdef HAVE_RTLD_NOLOAD
if ((handle = dlopen (LIBSOUP_2_SONAME, RTLD_NOW | RTLD_NOLOAD))) {
/* Force load of soup2 module */
- modules[0] = "libtracker-remote-soup2.so";
+ modules[0] = "libtracker-remote-soup2." G_MODULE_SUFFIX;
} else
#endif
{
- modules[0] = "libtracker-remote-soup3.so";
- modules[1] = "libtracker-remote-soup2.so";
+ modules[0] = "libtracker-remote-soup3." G_MODULE_SUFFIX;
+ modules[1] = "libtracker-remote-soup2." G_MODULE_SUFFIX;
}
g_clear_pointer (&handle, dlclose);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]