Ticket #14804: spidermonkey.diff

File spidermonkey.diff, 3.4 KB (added by akira@…, 17 years ago)
  • files/spidermonkey-1.5-threadsafe.diff

     
    1 --- Makefile.ref.orig   2006-03-06 03:31:04.000000000 +0000
    2 +++ Makefile.ref        2006-03-06 03:33:03.000000000 +0000
    3 @@ -61,11 +61,11 @@
     1--- Makefile.ref.orig   2008-03-27 00:51:10.000000000 +0900
     2+++ Makefile.ref        2008-03-27 00:52:01.000000000 +0900
     3@@ -63,11 +63,11 @@
    44 
    55 ifdef JS_THREADSAFE
    66 DEFINES += -DJS_THREADSAFE
    7 -INCLUDES += -I../../dist/$(OBJDIR)/include
     7-INCLUDES += -I$(DIST)/include/nspr
    88+INCLUDES += -I__PREFIX__/include/nspr
    99 ifdef USE_MSVC
    10  OTHER_LIBS += ../../dist/$(OBJDIR)/lib/libnspr${NSPR_LIBSUFFIX}.lib
     10 OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
    1111 else
    12 -OTHER_LIBS += -L../../dist/$(OBJDIR)/lib -lnspr${NSPR_LIBSUFFIX}
    13 +OTHER_LIBS += -L__PREFIX__$(LIBDIR) -lnspr${NSPR_LIBSUFFIX}
     12-OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
     13+OTHER_LIBS += -L__PREFIX__/lib -lnspr$(NSPR_LIBSUFFIX)
    1414 endif
    1515 endif
    1616 
  • files/patch-config-Darwin.mk

     
    1 $NetBSD: patch-ac,v 1.2 2006/12/05 18:04:18 tron Exp $
    2 
    3 --- config/Darwin.mk.orig       2005-02-12 20:10:33.000000000 +0000
    4 +++ config/Darwin.mk    2006-12-05 16:41:04.000000000 +0000
     1--- config/Darwin.mk.orig       2008-03-27 00:54:53.000000000 +0900
     2+++ config/Darwin.mk    2008-03-27 00:57:23.000000000 +0900
    53@@ -43,13 +43,13 @@
    64 # Just ripped from Linux config
    75 #
     
    1513+OS_CFLAGS = -DJS_THREADSAFE -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN
    1614 
    1715 RANLIB = ranlib
    18 -MKSHLIB = libtool $(XMKSHLIBOPTS) -framework System
     16-MKSHLIB = $(CC) -dynamiclib $(XMKSHLIBOPTS) -framework System
    1917+MKSHLIB = $(CC) -framework System -dynamiclib $(XMKSHLIBOPTS) -lm -lplds4 -lplc4 -lnspr4 $(LDFLAGS)
    2018 
    21  #.c.o:
    22  #      $(CC) -c -MD $*.d $(CFLAGS) $<
    23 @@ -57,7 +57,6 @@
     19 SO_SUFFIX = dylib
     20 
     21@@ -59,7 +59,6 @@
    2422 CPU_ARCH = $(shell uname -m)
    2523 ifeq (86,$(findstring 86,$(CPU_ARCH)))
    2624 CPU_ARCH = x86
     
    2826 endif
    2927 GFX_ARCH = x
    3028 
    31 @@ -65,14 +64,6 @@
     29@@ -67,14 +66,6 @@
    3230 
    3331 ASFLAGS += -x assembler-with-cpp
    3432 
  • Portfile

     
    33PortSystem 1.0
    44
    55name                    spidermonkey
    6 version                 1.60
    7 revision                1
     6version                 1.7.0
    87categories              lang
    98platforms               darwin
    10 maintainers             nomaintainer
     9maintainers             akira openmaintainer
    1110description             JavaScript-C Engine
    1211long_description        ${description}
    1312
     
    1716                        http://ftp.mozilla.org/pub/mozilla.org/js/older-packages/ \
    1817                        ftp://ftp.mozilla.org/pub/mozilla.org/js/older-packages/
    1918distname                js-${version}
    20 checksums               md5 bd8f021e43a8fbbec55ac2cd3d483243
     19checksums               md5 5571134c3863686b623ebe4e6b1f6fe6 \
     20                        sha1 1a99e8e10cb6600a03ea98895583a8ed42136d1f \
     21                        rmd160 6eadf1ac7c10a13b3db3d499856c9e18ddbcdfdb
    2122
    2223depends_build           port:readline \
    2324                        port:nspr
     
    3940
    4041use_configure   no
    4142
    42 build.args              -j1 -f Makefile.ref LIBDIR="/lib" SO_SUFFIX=dylib JS_THREADSAFE=1
     43build.args              -f Makefile.ref LIBDIR="/lib" SO_SUFFIX=dylib JS_THREADSAFE=1
    4344
    4445post-build {
    4546        system "ranlib ${worksrcpath}/Darwin_OPT.OBJ/libjs.a"