1 files changed, 103 insertions, 0 deletions
diff --git a/patches/bug812265-versioned-js-config.patch b/patches/bug812265-versioned-js-config.patch
new file mode 100644
index 0000000..74ab360
--- /dev/null
+++ b/patches/bug812265-versioned-js-config.patch
@@ -0,0 +1,103 @@
+From: Tim Lunn <tim@feathertop.org>
+Date: Wed, 20 Feb 2013 15:33:26 +1100
+
+[PATCH] add versioning to js and js-config
+
+From 45c5c70c16b933e65f0ea5b2953577435f78388a Mon Sep 17 00:00:00 2001
+---
+ js/src/Makefile.in       | 12 ++++++------
+ js/src/configure.in      | 16 ++++++++++++++--
+ js/src/shell/Makefile.in |  2 +-
+ 3 files changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -564,7 +564,7 @@ JITFLAGS = ,m,am,amd,n,mn,amn,amdn,mdn
+ check-jit-test::
+ 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/jit-test/jit_test.py \
+ 	        --no-slow --no-progress --tinderbox --jitflags=$(JITFLAGS) $(JITTEST_VALGRIND_FLAG) \
+-	        $(DIST)/bin/js$(BIN_SUFFIX)
++	        $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX)
+ 
+ check:: check-jit-test
+ 
+@@ -581,7 +581,7 @@ check-jstests:
+ 				--no-extensions \
+ 				--timeout 300 \
+ 				--args="`echo $$f | sed 's/\(.\)/ -\1/g'`" \
+-				$(DIST)/bin/js$(BIN_SUFFIX); \
++				$(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX); \
+ 			RC=$$(( $$RC || $$?)); \
+ 		done; \
+ 	exit $$RC
+@@ -776,13 +776,13 @@ JS_CONFIG_SUBSTITUTIONS=\
+ 	-DNSPR_CFLAGS="$(NSPR_CFLAGS)" \
+ 	-DNSPR_PKGCONF_CHECK="$(NSPR_PKGCONF_CHECK)"
+ 
+-js-config: js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk $(topsrcdir)/config/rules.mk
++$(JS_CONFIG_NAME): js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk $(topsrcdir)/config/rules.mk
+ 	$(RM) $@.tmp
+ 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(JS_CONFIG_SUBSTITUTIONS) $< > $@.tmp \
+-	&& mv js-config.tmp $@ && chmod +x $@
++	&& mv $@.tmp $@ && chmod +x $@
+ 
+-SCRIPTS = js-config
+-SDK_BINARY = js-config
++SCRIPTS = $(JS_CONFIG_NAME)
++SDK_BINARY = $(JS_CONFIG_NAME)
+ 
+ $(LIBRARY_NAME).pc: js.pc.in
+ 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(JS_CONFIG_SUBSTITUTIONS) $< > $@
+diff --git a/js/src/configure.in b/js/src/configure.in
+--- a/js/src/configure.in
++++ b/js/src/configure.in
+@@ -233,6 +233,16 @@ MOZJS_MAJOR_VERSION=`echo $MOZILLA_VERSI
+ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.\([0-9]*\).*|\1|"`
+ MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
+ IS_ALPHA=`echo $MOZILLA_VERSION | grep [ab]`
++
++if test -n "$JS_STANDALONE"; then
++JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION
++JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config
++else
++JS_SHELL_NAME=js
++JS_CONFIG_NAME=js-config
++fi
++
++
+ changequote([,])
+ if test -n "$IS_ALPHA"; then
+   changequote(,)
+@@ -241,6 +251,8 @@ if test -n "$IS_ALPHA"; then
+ fi
+ AC_DEFINE_UNQUOTED(MOZJS_MAJOR_VERSION,"$MOZJS_MAJOR_VERSION")
+ AC_DEFINE_UNQUOTED(MOZJS_MINOR_VERSION,"$MOZJS_MINOR_VERSION")
++AC_SUBST(JS_CONFIG_NAME)
++AC_SUBST(JS_SHELL_NAME)
+ AC_SUBST(MOZJS_MAJOR_VERSION)
+ AC_SUBST(MOZJS_MINOR_VERSION)
+ AC_SUBST(MOZJS_PATCH_VERSION)
+@@ -4513,8 +4525,8 @@ AC_OUTPUT($MAKEFILES)
+ 
+ # Produce the js-config script at configure time; see the comments for
+ # 'js-config' in Makefile.in.
+-AC_MSG_RESULT(invoking $MAKE to create js-config script)
+-$MAKE js-config
++AC_MSG_RESULT(invoking $MAKE to create $JS_CONFIG_NAME script)
++$MAKE $JS_CONFIG_NAME
+ 
+ # Build jsctypes if it's enabled.
+ if test "$JS_HAS_CTYPES" -a -z "$MOZ_NATIVE_FFI"; then
+diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
+--- a/js/src/shell/Makefile.in
++++ b/js/src/shell/Makefile.in
+@@ -11,7 +11,7 @@ VPATH		= @srcdir@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+-PROGRAM         = js$(BIN_SUFFIX)
++PROGRAM         = $(JS_SHELL_NAME)$(BIN_SUFFIX)
+ CPPSRCS		= \
+   js.cpp \
+   jsoptparse.cpp \