From dcd257c90366362662f8ee426198813f6311ece1 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 5 Jan 2014 00:47:13 +0000
Subject: Move nspr so it is only built for Spidermonkey 1.8.5

---
 sdk/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sdk/Makefile')

diff --git a/sdk/Makefile b/sdk/Makefile
index a13eb65..05f01c2 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -91,6 +91,7 @@ ifeq ($(TARGET),arm-unknown-riscos)
     EXTRAARGS_SPIDERMONKEY := BUILD_OPT=1 OS_ARCH=RISCOS OS_CPUARCH=arm OS_CONFIG=RISCOS
   else
     EXTRAARGS_SPIDERMONKEY := --disable-tracejit --disable-thumb2 --without-thumb --enable-static --disable-shared --disable-shared-js --with-cpu-arch=armv3 --disable-tests --disable-methodjit
+    SDK_ITEMS += $(addprefix $(BUILDSTEPS)/, spidermonkey.d)
   endif
 endif
 
@@ -496,7 +497,7 @@ $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz:
 
 
 # spidermonkey (libmozjs) 
-$(BUILDSTEPS)/spidermonkey.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr.d $(BUILDSTEPS)/spidermonkey-src.d
+$(BUILDSTEPS)/spidermonkey.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/spidermonkey-src.d
 ifeq ($(VERSION_SPIDERMONKEY),1.7.0)
 	$(env) make -C $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src -f Makefile.ref JS_DIST=$(GCCSDK_INSTALL_ENV) $(EXTRAARGS_SPIDERMONKEY)
 	$(env) make -C $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src -f Makefile.ref JS_DIST=$(GCCSDK_INSTALL_ENV) $(EXTRAARGS_SPIDERMONKEY) export
-- 
cgit v1.2.3


From 55a6196393df1608d9da186a177a34a0d970d3ec Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 5 Jan 2014 00:47:46 +0000
Subject: Add Spidermonkey to ppc-amigaos target

---
 sdk/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sdk/Makefile')

diff --git a/sdk/Makefile b/sdk/Makefile
index 05f01c2..e55f461 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -112,7 +112,7 @@ ifeq ($(TARGET),m5475-atari-mint)
 endif
 
 ifeq ($(TARGET),ppc-amigaos)
-  SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS))
+  SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d spidermonkey.d $(COMMON_SDK_ITEMS))
   EXTRAARGS_LIBCARES := --disable-shared
   EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
   VERSION_SPIDERMONKEY := 1.7.0
-- 
cgit v1.2.3


From d2711f8061b6afc53d4ef6aa208ce40acbed7e48 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 5 Jan 2014 00:51:04 +0000
Subject: Correct copy'n'paste error

---
 sdk/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sdk/Makefile')

diff --git a/sdk/Makefile b/sdk/Makefile
index e55f461..c2ae79e 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -91,7 +91,7 @@ ifeq ($(TARGET),arm-unknown-riscos)
     EXTRAARGS_SPIDERMONKEY := BUILD_OPT=1 OS_ARCH=RISCOS OS_CPUARCH=arm OS_CONFIG=RISCOS
   else
     EXTRAARGS_SPIDERMONKEY := --disable-tracejit --disable-thumb2 --without-thumb --enable-static --disable-shared --disable-shared-js --with-cpu-arch=armv3 --disable-tests --disable-methodjit
-    SDK_ITEMS += $(addprefix $(BUILDSTEPS)/, spidermonkey.d)
+    SDK_ITEMS += $(addprefix $(BUILDSTEPS)/, nspr.d)
   endif
 endif
 
-- 
cgit v1.2.3