From 98a58196790874965d57a329a9c10c20e9ffa4f6 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sun, 16 Dec 2012 18:43:04 +0000
Subject: switch spidermonkey to 1.7.0 build

---
 sdk/Makefile                                                 |  3 ++-
 .../spidermonkey/arm-unknown-riscos-1.7.0/mozilla-js.pc.in.p |  9 +++++++++
 .../patches/spidermonkey/arm-unknown-riscos-1.7.0/rules.mk.p | 12 +++++++-----
 3 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/mozilla-js.pc.in.p

(limited to 'sdk')

diff --git a/sdk/Makefile b/sdk/Makefile
index 0113144..e0b56bc 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -43,7 +43,8 @@ VERSION_WINDOM := 2.0.1
 VERSION_HERMES := 1.3.3
 VERSION_FREETYPE := 2.4.10
 VERSION_NSPR := 4.9.3
-VERSION_SPIDERMONKEY := 1.8.5
+#VERSION_SPIDERMONKEY := 1.8.5
+VERSION_SPIDERMONKEY := 1.7.0
 
 # Path
 path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/mozilla-js.pc.in.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/mozilla-js.pc.in.p
new file mode 100644
index 0000000..c70291f
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/mozilla-js.pc.in.p
@@ -0,0 +1,9 @@
+--- /dev/null	2012-12-14 09:53:07.266043019 +0000
++++ js/src/mozilla-js.pc.in	2012-12-16 18:37:54.000000000 +0000
+@@ -0,0 +1,6 @@
++
++Name: JavaScript
++Description: The Mozilla JavaScript Library
++Version: 1.7.0
++Libs: -L${prefix}/lib -ljs
++Cflags: -I${prefix}/include
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/rules.mk.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/rules.mk.p
index 418c018..d35d097 100644
--- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/rules.mk.p
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/rules.mk.p
@@ -1,5 +1,5 @@
---- js/src/rules.mk.orig	2012-12-16 14:55:34.000000000 +0000
-+++ js/src/rules.mk	2012-12-16 15:01:53.000000000 +0000
+--- js/src/rules.mk.orig	2012-12-16 18:31:06.000000000 +0000
++++ js/src/rules.mk	2012-12-16 18:34:05.000000000 +0000
 @@ -58,7 +58,7 @@
  # TARGETS = $(LIBRARY)   # $(PROGRAM) not supported for MSVC yet
  TARGETS += $(SHARED_LIBRARY) $(PROGRAM)  # it is now
@@ -9,19 +9,21 @@
  endif
  
  all:
-@@ -158,9 +158,9 @@
+@@ -158,19 +158,21 @@
  
  export:
  	+$(LOOP_OVER_PREDIRS)	
 -	mkdir -p $(DIST)/include $(DIST)/$(LIBDIR) $(DIST)/bin
-+	mkdir -p $(DIST)/include/js $(DIST)/$(LIBDIR) $(DIST)/bin
++	mkdir -p $(DIST)/include/js $(DIST)/$(LIBDIR)/pkgconfig $(DIST)/bin
  ifneq "$(strip $(HFILES))" ""
 -	$(CP) $(HFILES) $(DIST)/include
 +	$(CP) $(HFILES) $(DIST)/include/js/
  endif
  ifneq "$(strip $(LIBRARY))" ""
  	$(CP) $(LIBRARY) $(DIST)/$(LIBDIR)
-@@ -168,9 +168,9 @@
++	echo "prefix=$(DIST)" > $(DIST)/$(LIBDIR)/pkgconfig/mozilla-js.pc
++	cat mozilla-js.pc.in >> $(DIST)/$(LIBDIR)/pkgconfig/mozilla-js.pc
+ endif
  ifneq "$(strip $(JARS))" ""
  	$(CP) $(JARS) $(DIST)/$(LIBDIR)
  endif
-- 
cgit v1.2.3