Auto merge of #170 - servo:jdm-patch-4, r=asajeffrey

Disable all shared library code

This should work around the duplicate DllMain that's appearing in servo/servo#22856.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/mozjs/170)
<!-- Reviewable:end -->

Author: bors-servo

Cargo.toml

@@ -2,7 +2,7 @@
 name = "mozjs_sys"
 description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
 repository = "https://github.com/servo/mozjs/"
-version = "0.61.6"
+version = "0.61.7"
 authors = ["Mozilla"]
 links = "mozjs"
 build = "build.rs"

etc/patches/disable-nspr-shared.patch

@@ -0,0 +1,22 @@
+diff --git a/mozjs/config/external/nspr/moz.build b/mozjs/config/external/nspr/moz.build
+index 18b9a1a5cf..231f6ec380 100644
+--- a/mozjs/config/external/nspr/moz.build
++++ b/mozjs/config/external/nspr/moz.build
+@@ -18,11 +18,12 @@ if CONFIG['MOZ_BUILD_NSPR']:
+             'nss',
+         ]
+     else:
+-        USE_LIBS += [
+-            #'nspr4',
+-            'plc4',
+-            'plds4',
+-        ]
++        #USE_LIBS += [
++        #    'nspr4',
++        #    'plc4',
++        #    'plds4',
++        #]
++        pass
+     EXPORTS.nspr += ['prcpucfg.h']
+ else:
+     OS_LIBS += CONFIG['NSPR_LIBS']

makefile.cargo

@@ -7,6 +7,7 @@ CONFIGURE_FLAGS := \
 	--disable-jemalloc \
 	--disable-js-shell \
 	--disable-tests \
+	--disable-shared-js \
 	--build-backends=RecursiveMake
 
 ifneq ($(HOST),$(TARGET))

mozjs/config/external/nspr/moz.build

@@ -18,11 +18,12 @@ if CONFIG['MOZ_BUILD_NSPR']:
             'nss',
         ]
     else:
-        USE_LIBS += [
-            'nspr4',
-            'plc4',
-            'plds4',
-        ]
+        #USE_LIBS += [
+        #    'nspr4',
+        #    'plc4',
+        #    'plds4',
+        #]
+        pass
     EXPORTS.nspr += ['prcpucfg.h']
 else:
     OS_LIBS += CONFIG['NSPR_LIBS']