[Lunar-commits] <moonbase> spidermonkey: Module revamp

[Stefan Wold]

commit 08789be53a414b87609e45e8505a88d5e5699b0a
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Sun Dec 5 17:40:33 2010 +0100

    spidermonkey: Module revamp
    
    Cleaned up the module after renaming it from js -> spidermonkey.
    We should not use a rc1 release either, version have been
    downgraded to 1.7.0 with a few patches.
---
 libs/spidermonkey/BUILD   |   26 +++++++++-----------------
 libs/spidermonkey/DEPENDS |    2 +-
 libs/spidermonkey/DETAILS |   22 ++++++++++++++--------
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/libs/spidermonkey/BUILD b/libs/spidermonkey/BUILD
index 962887c..57c4186 100644
--- a/libs/spidermonkey/BUILD
+++ b/libs/spidermonkey/BUILD
@@ -1,24 +1,16 @@
 (
 
-  # all our work is in here
-  cd src/  &&
+  export CFLAGS="${CFLAGS} -DJS_C_STRINGS_ARE_UTF8"
 
-  # need to be run twice, it's a silly build system
-  make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 JS_DIST=/usr &&
-  make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 JS_DIST=/usr &&
+  patch_it $SOURCE2 1 &&
+  patch_it $SOURCE3 1 &&
+  patch_it $SOURCE4 1 &&
 
-  cd Linux_All_OPT.OBJ  &&
-  prepare_install       &&
+  sedit 's;include;include/js;' src/rules.mk &&
 
-  # install the lib and binaries
-  install libjs.a /usr/lib             &&
-  install libjs.so /usr/lib            &&
-  install -m0755 js jscpucfg /usr/bin  &&
-
-  # install the development headers
-  mkdir -p /usr/include/$MODULE            &&
-  install -m0644 *.h /usr/include/$MODULE  &&
-  cd ..                                    &&
-  install -m0644 *.{h,tbl} /usr/include/$MODULE
+  cd $SOURCE_DIRECTORY/src &&
+  make -f Makefile.ref JS_THREADSAFE=1 &&
+  prepare_install &&
+  make -f Makefile.ref install
 
 ) > $C_FIFO 2>&1
diff --git a/libs/spidermonkey/DEPENDS b/libs/spidermonkey/DEPENDS
index e1e317d..2083bb2 100644
--- a/libs/spidermonkey/DEPENDS
+++ b/libs/spidermonkey/DEPENDS
@@ -1 +1 @@
-depends nss
+depends nspr
diff --git a/libs/spidermonkey/DETAILS b/libs/spidermonkey/DETAILS
index 74dd22a..ecd7df9 100644
--- a/libs/spidermonkey/DETAILS
+++ b/libs/spidermonkey/DETAILS
@@ -1,16 +1,22 @@
           MODULE=spidermonkey
          VERSION=1.7.0
-          SOURCE=$MODULE-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/js
+          SOURCE=js-${VERSION}.tar.gz
+         SOURCE2=$MODULE-1.5-build.patch
+         SOURCE3=$MODULE-1.7.0-Makefile.patch
+         SOURCE4=$MODULE-1.7.0-threadsafe.patch
       SOURCE_URL=ftp://ftp.mozilla.org/pub/mozilla.org/js
-      SOURCE_VFY=sha1:1577bd39a2ebd9f5e2ec90e72d9a6aa85f840564
+     SOURCE2_URL=$PATCH_URL
+     SOURCE3_URL=$PATCH_URL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/js
+      SOURCE_VFY=sha256:44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b
+     SOURCE2_VFY=sha256:04a2b3b1b85825f463c6eb703d32e66747e2a8cca81b0026b958862eb1248fdb
+     SOURCE3_VFY=sha256:3707e3f85a7a2a698c23f38dad0b1006c753f89bf051f125bd5ac83212a02841
+     SOURCE4_VFY=sha256:92bafa79933dc28f7ffefa1ccebdf181a18b5638ced278759ce25d51f2438789
         WEB_SITE=http://www.mozilla.org/js/spidermonkey/
          ENTERED=20051030
-         UPDATED=20100124
-           SHORT="A standalone JavaScript C library developed by Mozilla.org"
-           PSAFE=no
-
-cat << EOF
+         UPDATED=20101205
+           SHORT="Mozilla's C implementation of JavaScript"
+cat <<EOF
 This is SpiderMonkey, Mozilla's C implementation of JavaScript.
 SpiderMonkey is written in C and contains a compiler, interpreter,
 decompiler, garbage collector, and standard classes. It is intended to