Bug 809430 - Add symbol-versions to libxul and libmozjs for linux. r=glandium

js/src/Makefile.in

@@ -539,6 +539,18 @@ include $(MFBT_ROOT)/sources.mk
 DEFINES += -DIMPL_MFBT
 endif
 
+# ensure symbol versions of shared library on linux do not conflict with those in libxul
+ifeq (Linux,$(OS_TARGET))
+EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
+
+symverscript: symverscript.in
+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+		-DVERSION="$(subst -,_,$(LIBRARY_NAME))" $< > $@
+
+EXTRA_DEPS += symverscript
+
+endif
+
 EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
 
 ifndef BUILD_OPT

js/src/symverscript.in

@@ -0,0 +1,5 @@
+#filter substitution
+@VERSION@ {
+	global: *;
+};
+

toolkit/library/Makefile.in

@@ -131,6 +131,14 @@ endif
 ifeq (Linux,$(OS_ARCH))
 ifneq (Android,$(OS_TARGET))
 OS_LIBS += -lrt
+EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
+
+symverscript: symverscript.in
+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+		-DVERSION="XUL_$(MOZILLA_VERSION)" $< > $@
+
+EXTRA_DEPS += symverscript
+
 endif
 endif
 

toolkit/library/symverscript.in

@@ -0,0 +1,5 @@
+#filter substitution
+@VERSION@ {
+	global: *;
+};
+