Auto merge of #185 - jdm:no-nspr, r=asajeffrey

Don't build NSPR at all.

<!-- 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/185)
<!-- Reviewable:end -->

Author: bors-servo

build.rs

@@ -123,8 +123,6 @@ fn build_jsapi() {
         println!("cargo:rustc-link-lib=psapi");
         println!("cargo:rustc-link-lib=user32");
         println!("cargo:rustc-link-lib=Dbghelp");
-        println!("cargo:rustc-link-search=native={}/config/external/nspr/pr", out_dir);
-        println!("cargo:rustc-link-lib=nspr4");
         if target.contains("gnu") {
             println!("cargo:rustc-link-lib=stdc++");
         }

etc/patches/nspr-emulation-windiws.patch

@@ -0,0 +1,25 @@
+diff --git a/mozjs/js/src/vm/PosixNSPR.cpp b/mozjs/js/src/vm/PosixNSPR.cpp
+index 41ce31e488..fdeee75b1b 100644
+--- a/mozjs/js/src/vm/PosixNSPR.cpp
++++ b/mozjs/js/src/vm/PosixNSPR.cpp
+@@ -11,7 +11,6 @@
+ #ifdef JS_POSIX_NSPR
+ 
+ #  include <errno.h>
+-#  include <sys/time.h>
+ #  include <time.h>
+ 
+ int32_t PR_FileDesc2NativeHandle(PRFileDesc *fd) {
+diff --git a/mozjs/js/src/vm/Time.cpp b/mozjs/js/src/vm/Time.cpp
+index e1c810cc29..19ee15009b 100644
+--- a/mozjs/js/src/vm/Time.cpp
++++ b/mozjs/js/src/vm/Time.cpp
+@@ -27,8 +27,6 @@
+ #  include <mmsystem.h> /* for timeBegin/EndPeriod */
+ #  include <stdlib.h>   /* for _set_invalid_parameter_handler */
+ 
+-#  include "prinit.h"
+-
+ #endif
+ 
+ #ifdef XP_UNIX

makefile.cargo

@@ -8,7 +8,8 @@ CONFIGURE_FLAGS := \
 	--disable-js-shell \
 	--disable-tests \
 	--disable-shared-js \
-	--build-backends=RecursiveMake
+	--build-backends=RecursiveMake \
+        --enable-posix-nspr-emulation
 
 ifeq (windows,$(findstring windows,$(TARGET)))
 	WINDOWS := 1

mozjs/js/src/vm/PosixNSPR.cpp

@@ -11,7 +11,6 @@
 #ifdef JS_POSIX_NSPR
 
 #  include <errno.h>
-#  include <sys/time.h>
 #  include <time.h>
 
 int32_t PR_FileDesc2NativeHandle(PRFileDesc *fd) {

mozjs/js/src/vm/Time.cpp

@@ -27,8 +27,6 @@
 #  include <mmsystem.h> /* for timeBegin/EndPeriod */
 #  include <stdlib.h>   /* for _set_invalid_parameter_handler */
 
-#  include "prinit.h"
-
 #endif
 
 #ifdef XP_UNIX