From 55087d03e4161603e11471fd1c6af426bae71e09 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Sat, 7 Nov 2015 09:57:30 +0100 Subject: [PATCH] browser-plugin: link with -Wl,-z,nodelete This ensures that the module will not be unloaded, since GObject types registered statically can't be reloaded. This should fix crashes with browsers that correctly unload the plugins. https://bugzilla.gnome.org/show_bug.cgi?id=737932 --- browser-plugin/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am index 20889649e..6ed1d6340 100644 --- a/browser-plugin/Makefile.am +++ b/browser-plugin/Makefile.am @@ -3,7 +3,10 @@ mozillalibdir = $(BROWSER_PLUGIN_DIR) mozillalib_LTLIBRARIES = libgnome-shell-browser-plugin.la -libgnome_shell_browser_plugin_la_LDFLAGS = -module -avoid-version -no-undefined +# Browsers can unload and reload the module while browsing, which is not supported by GObject. +# We pass -Wl,-z,nodelete to the linker to ensure the module is never unloaded. +# https://bugzilla.gnome.org/show_bug.cgi?id=737932 +libgnome_shell_browser_plugin_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,-z,nodelete libgnome_shell_browser_plugin_la_LIBADD = \ $(BROWSER_PLUGIN_LIBS)