cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to spidermonkey-1.7.0v0. from Benoit Chesneau with couple

Browse Source 
of tweaks from naddy@ and myself.
full bulk build done by naddy@ and jasper@
ok naddy@
This commit is contained in:
martynas 2009-05-05 21:01:55 +00:00
parent fb518f37e5
commit f2cc6c9271
13 changed files with 87 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lang/spidermonkey/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.9 2009/02/03 22:23:19 martynas Exp $
# $OpenBSD: Makefile,v 1.10 2009/05/05 21:01:55 martynas Exp $
SHARED_ONLY= Yes
COMMENT= Mozilla's C implementation of JavaScript
V= 1.60
V= 1.7.0
DISTNAME= js-${V}
PKGNAME= spidermonkey-${V}p3
PKGNAME= spidermonkey-${V}v0
SHARED_LIBS= js 2.0
CATEGORIES= lang
@ -41,15 +41,15 @@ MAKE_FLAGS= SO_SUFFIX=so.${LIBjs_VERSION} \
USE_GMAKE= Yes
NO_REGRESS= Yes
HEADERS= jsapi.h jscompat.h jslong.h jsosdep.h jsotypes.h \
jspubtd.h jstypes.h jsstr.h jshash.h jsprvtd.h \
Linux_All_DBG.OBJ/jsautocfg.h
HEADERS= jsapi.h jsconfig.h jscompat.h jslong.h jsosdep.h \
jsotypes.h jspubtd.h jstypes.h jsstr.h jshash.h jsprvtd.h \
jsproto.tbl
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/Linux_All_DBG.OBJ/js ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/Linux_All_DBG.OBJ/libjs.so.${LIBjs_VERSION} ${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/include/js
@cd ${WRKSRC} && \
${INSTALL_DATA} ${HEADERS} ${PREFIX}/include/js/
@cd ${WRKSRC} && ${INSTALL_DATA} ${HEADERS} \
${WRKSRC}/Linux_All_DBG.OBJ/jsautocfg.h ${PREFIX}/include/js/
.include <bsd.port.mk>

10
lang/spidermonkey/distinfo
View File

@ -1,5 +1,5 @@
MD5 (js-1.60.tar.gz) = vY8CHkOo+77FWsLNPUgyQw==
RMD160 (js-1.60.tar.gz) = Yw4PVgbZzDmNqkHnHKP5jATjrtI=
SHA1 (js-1.60.tar.gz) = 2xRXwo0qVQgFINdWWiwnHrFZkGQ=
SHA256 (js-1.60.tar.gz) = z/vPZyG4l8oSWWYfQY89gcEZNwL1minw8yMsm48k+qM=
SIZE (js-1.60.tar.gz) = 1081150
MD5 (js-1.7.0.tar.gz) = VXETTDhjaGtiPr5Oax9v5g==
RMD160 (js-1.7.0.tar.gz) = bq3xrHwQoTs9s9SZhWyeGN2839s=
SHA1 (js-1.7.0.tar.gz) = Gpno4Qy2YAoD6piJVYOo7UITbR8=
SHA256 (js-1.7.0.tar.gz) = RDY/DziVgA7mAQdj6ukMDRXtKOB9eDvHs8YHzpjYZos=
SIZE (js-1.7.0.tar.gz) = 1165607

34
lang/spidermonkey/patches/patch-src_Makefile_ref
View File

@ -1,35 +1,11 @@
$OpenBSD: patch-src_Makefile_ref,v 1.2 2007/04/10 13:03:09 martynas Exp $
--- src/Makefile.ref.orig Mon Aug 21 21:58:45 2006
+++ src/Makefile.ref Mon Apr 9 21:26:10 2007
@@ -55,8 +55,6 @@ include config.mk
ifdef USE_MSVC
OTHER_LIBS += fdlibm/$(OBJDIR)/fdlibm.lib
-else
-OTHER_LIBS += -Lfdlibm/$(OBJDIR) -lfdm
endif
ifdef JS_THREADSAFE
@@ -248,12 +246,8 @@ JS_CFILES = \
prmjtime.c \
$(NULL)
-PREDIRS += fdlibm
-
ifdef USE_MSVC
FDLIBM_LIBRARY = fdlibm/$(OBJDIR)/fdlibm.lib
-else
-FDLIBM_LIBRARY = fdlibm/$(OBJDIR)/libfdm.a
endif
JSMATH_PRELINK = $(OBJDIR)/jsmathtemp.o
# Flag for incremental linking
@@ -307,8 +301,8 @@ ifdef USE_MSVC
$(PROGRAM): $(PROG_OBJS) $(LIBRARY) $(FDLIBM_LIBRARY)
$OpenBSD: patch-src_Makefile_ref,v 1.3 2009/05/05 21:01:55 martynas Exp $
--- src/Makefile.ref.orig Sun Feb 1 09:53:09 2009
+++ src/Makefile.ref Sun Feb 1 09:54:00 2009
@@ -336,7 +336,7 @@ $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
else
-$(PROGRAM): $(PROG_OBJS) $(LIBRARY) $(FDLIBM_LIBRARY)
$(PROGRAM): $(PROG_OBJS) $(LIBRARY)
- $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
+$(PROGRAM): $(PROG_OBJS) $(SHARED_LIBRARY) $(FDLIBM_LIBRARY)
+ $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) -L$(OBJDIR) -ljs $(LDFLAGS) $(OTHER_LIBS) \
$(PROG_LIBS)
endif

16
lang/spidermonkey/patches/patch-src_config_mk
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-src_config_mk,v 1.2 2007/04/10 13:03:09 martynas Exp $
--- src/config.mk.orig Sat Nov 15 02:10:55 2003
+++ src/config.mk Mon Apr 9 21:26:10 2007
@@ -90,6 +90,9 @@ endif
$OpenBSD: patch-src_config_mk,v 1.3 2009/05/05 21:01:55 martynas Exp $
--- src/config.mk.orig Sun Feb 1 09:25:52 2009
+++ src/config.mk Sun Feb 1 09:26:40 2009
@@ -94,6 +94,9 @@ endif
ifeq ($(OS_ARCH),Linux)
OS_CONFIG := Linux_All
else
+ifeq ($(OS_ARCH), OpenBSD)
+ifeq ($(OS_ARCH),OpenBSD)
+OS_CONFIG := Linux_All
+else
ifeq ($(OS_ARCH),dgux)
OS_CONFIG := dgux
else
@@ -100,6 +103,7 @@ OS_CONFIG := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE
@@ -104,6 +107,7 @@ OS_CONFIG := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE
endif
endif
endif
@ -19,11 +19,11 @@ $OpenBSD: patch-src_config_mk,v 1.2 2007/04/10 13:03:09 martynas Exp $
ASFLAGS =
DEFINES =
@@ -122,7 +126,7 @@ OPTIMIZER = -Zi
@@ -126,7 +130,7 @@ OPTIMIZER = -Zi
else
OPTIMIZER = -g
endif
-DEFINES += -DDEBUG -DDEBUG_$(shell whoami)
-DEFINES += -DDEBUG -DDEBUG_$(USER)
+DEFINES += -DDEBUG
OBJDIR_TAG = _DBG
endif

26
lang/spidermonkey/patches/patch-src_js_c
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-src_js_c,v 1.2 2007/04/10 13:03:09 martynas Exp $
--- src/js.c.orig Thu Nov 30 02:34:45 2006
+++ src/js.c Mon Apr 9 21:26:10 2007
@@ -900,7 +900,7 @@ SrcNotes(JSContext *cx, JSScript *script)
for (sn = notes; !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn)) {
delta = SN_DELTA(sn);
offset += delta;
$OpenBSD: patch-src_js_c,v 1.3 2009/05/05 21:01:55 martynas Exp $
--- src/js.c.orig Sun Feb 1 09:27:41 2009
+++ src/js.c Sun Feb 1 09:30:25 2009
@@ -978,7 +978,7 @@ SrcNotes(JSContext *cx, JSScript *script)
}
}
}
- fprintf(gOutFile, "%3u: %5u [%4u] %-8s",
+ fprintf(gOutFile, "%3tu: %5u [%4u] %-8s",
PTRDIFF(sn, notes, jssrcnote), offset, delta,
js_SrcNoteSpec[SN_TYPE(sn)].name);
type = (JSSrcNoteType) SN_TYPE(sn);
@@ -985,7 +985,7 @@ TryNotes(JSContext *cx, JSScript *script)
PTRDIFF(sn, notes, jssrcnote), offset, delta, name);
switch (type) {
case SRC_SETLINE:
@@ -1073,7 +1073,7 @@ TryNotes(JSContext *cx, JSScript *script)
return JS_TRUE;
fprintf(gOutFile, "\nException table:\nstart\tend\tcatch\n");
while (tn->start && tn->catchStart) {
@ -19,12 +19,12 @@ $OpenBSD: patch-src_js_c,v 1.2 2007/04/10 13:03:09 martynas Exp $
tn->start, tn->start + tn->length, tn->catchStart);
tn++;
}
@@ -1205,7 +1205,7 @@ DumpScope(JSContext *cx, JSObject *obj, FILE *fp)
@@ -1297,7 +1297,7 @@ DumpScope(JSContext *cx, JSObject *obj, FILE *fp)
DUMP_ATTR(SETTER);
#undef DUMP_ATTR
- fprintf(fp, " slot %lu flags %x shortid %d\n",
+ fprintf(fp, " slot %u flags %x shortid %d\n",
sprop->slot, sprop->flags, sprop->shortid);
(unsigned long)sprop->slot, sprop->flags, sprop->shortid);
}
}

12
lang/spidermonkey/patches/patch-src_jsapi_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_jsapi_c,v 1.2 2007/04/10 13:03:09 martynas Exp $
--- src/jsapi.c.orig Thu Nov 30 02:34:45 2006
+++ src/jsapi.c Mon Apr 9 21:26:10 2007
@@ -130,7 +130,7 @@ JS_GetEmptyStringValue(JSContext *cx)
$OpenBSD: patch-src_jsapi_c,v 1.3 2009/05/05 21:01:55 martynas Exp $
--- src/jsapi.c.orig Wed Oct 3 17:36:48 2007
+++ src/jsapi.c Sun May 3 23:07:02 2009
@@ -134,7 +134,7 @@ JS_GetEmptyStringValue(JSContext *cx)
static JSBool
TryArgumentFormatter(JSContext *cx, const char **formatp, JSBool fromJS,
@ -10,7 +10,7 @@ $OpenBSD: patch-src_jsapi_c,v 1.2 2007/04/10 13:03:09 martynas Exp $
{
const char *format;
JSArgumentFormatMap *map;
@@ -259,8 +259,7 @@ JS_ConvertArgumentsVA(JSContext *cx, uintN argc, jsval
@@ -263,8 +263,7 @@ JS_ConvertArgumentsVA(JSContext *cx, uintN argc, jsval
break;
default:
format--;
@ -20,7 +20,7 @@ $OpenBSD: patch-src_jsapi_c,v 1.2 2007/04/10 13:03:09 martynas Exp $
return JS_FALSE;
}
/* NB: the formatter already updated sp, so we continue here. */
@@ -362,8 +361,7 @@ JS_PushArgumentsVA(JSContext *cx, void **markp, const
@@ -366,8 +365,7 @@ JS_PushArgumentsVA(JSContext *cx, void **markp, const
break;
default:
format--;

8
lang/spidermonkey/patches/patch-src_jslock_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_jslock_c,v 1.1.1.1 2006/10/01 23:02:12 steven Exp $
--- src/jslock.c.orig Sun Apr 4 00:21:03 2004
+++ src/jslock.c Mon Sep 25 16:40:31 2006
@@ -193,7 +193,9 @@ js_FinishLock(JSThinLock *tl)
$OpenBSD: patch-src_jslock_c,v 1.2 2009/05/05 21:01:55 martynas Exp $
--- src/jslock.c.orig Fri Mar 30 00:55:35 2007
+++ src/jslock.c Sun May 3 23:07:02 2009
@@ -224,7 +224,9 @@ js_FinishLock(JSThinLock *tl)
#endif
}

12
lang/spidermonkey/patches/patch-src_jsopcode_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_jsopcode_c,v 1.2 2007/04/10 13:03:09 martynas Exp $
--- src/jsopcode.c.orig Thu Nov 30 02:34:45 2006
+++ src/jsopcode.c Mon Apr 9 21:26:10 2007
@@ -183,7 +183,7 @@ js_Disassemble1(JSContext *cx, JSScript *script, jsbyt
$OpenBSD: patch-src_jsopcode_c,v 1.3 2009/05/05 21:01:55 martynas Exp $
--- src/jsopcode.c.orig Thu Sep 27 21:30:18 2007
+++ src/jsopcode.c Sun May 3 23:07:02 2009
@@ -208,7 +208,7 @@ js_Disassemble1(JSContext *cx, JSScript *script, jsbyt
case JOF_JUMP:
case JOF_JUMPX:
off = GetJumpOffset(pc, pc);
@ -10,7 +10,7 @@ $OpenBSD: patch-src_jsopcode_c,v 1.2 2007/04/10 13:03:09 martynas Exp $
break;
case JOF_CONST:
@@ -214,10 +214,10 @@ js_Disassemble1(JSContext *cx, JSScript *script, jsbyt
@@ -239,10 +239,10 @@ js_Disassemble1(JSContext *cx, JSScript *script, jsbyt
pc2 += JUMP_OFFSET_LEN;
high = GET_JUMP_OFFSET(pc2);
pc2 += JUMP_OFFSET_LEN;
@ -23,7 +23,7 @@ $OpenBSD: patch-src_jsopcode_c,v 1.2 2007/04/10 13:03:09 martynas Exp $
pc2 += jmplen;
}
len = 1 + pc2 - pc;
@@ -237,7 +237,7 @@ js_Disassemble1(JSContext *cx, JSScript *script, jsbyt
@@ -262,7 +262,7 @@ js_Disassemble1(JSContext *cx, JSScript *script, jsbyt
pc2 += jmplen;
npairs = GET_ATOM_INDEX(pc2);
pc2 += ATOM_INDEX_LEN;

8
lang/spidermonkey/patches/patch-src_jsosdep_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_jsosdep_h,v 1.2 2007/04/10 13:03:09 martynas Exp $
--- src/jsosdep.h.orig Fri Jul 8 01:35:39 2005
+++ src/jsosdep.h Mon Apr 9 21:26:10 2007
@@ -86,7 +86,7 @@
$OpenBSD: patch-src_jsosdep_h,v 1.3 2009/05/05 21:01:55 martynas Exp $
--- src/jsosdep.h.orig Fri Jul 7 05:12:02 2006
+++ src/jsosdep.h Sun May 3 23:07:02 2009
@@ -89,7 +89,7 @@
#elif defined(SOLARIS)
#define JS_HAVE_LONG_LONG

8
lang/spidermonkey/patches/patch-src_jspubtd_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_jspubtd_h,v 1.2 2007/04/10 13:03:09 martynas Exp $
--- src/jspubtd.h.orig Thu Nov 30 02:34:45 2006
+++ src/jspubtd.h Mon Apr 9 21:26:10 2007
@@ -567,7 +567,7 @@ typedef const JSErrorFormatString *
$OpenBSD: patch-src_jspubtd_h,v 1.3 2009/05/05 21:01:55 martynas Exp $
--- src/jspubtd.h.orig Sat Jun 23 02:13:21 2007
+++ src/jspubtd.h Sun May 3 23:07:02 2009
@@ -616,7 +616,7 @@ typedef const JSErrorFormatString *
typedef JSBool
(* JS_DLL_CALLBACK JSArgumentFormatter)(JSContext *cx, const char *format,
JSBool fromJS, jsval **vpp,

12
lang/spidermonkey/patches/patch-src_jsstr_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_jsstr_c,v 1.1 2009/05/05 21:01:55 martynas Exp $
--- src/jsstr.c.orig Sun Feb 1 11:26:35 2009
+++ src/jsstr.c Sun Feb 1 11:27:13 2009
@@ -1815,6 +1815,8 @@ str_split(JSContext *cx, JSObject *obj, uintN argc, js
jsint i, j;
uint32 len, limit;
+ memset(&tmp, 0, sizeof(tmp));
+
str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
if (!str)
return JS_FALSE;

16
lang/spidermonkey/patches/patch-src_jstypes_h
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-src_jstypes_h,v 1.2 2007/04/10 13:03:09 martynas Exp $
--- src/jstypes.h.orig Sun Sep 18 07:35:05 2005
+++ src/jstypes.h Mon Apr 9 21:42:19 2007
@@ -387,8 +387,9 @@ typedef JSUint8 JSPackedBool;
/*
** A JSWord is an integer that is the same size as a void*
*/
$OpenBSD: patch-src_jstypes_h,v 1.3 2009/05/05 21:01:55 martynas Exp $
--- src/jstypes.h.orig Sun Feb 1 09:30:58 2009
+++ src/jstypes.h Sun Feb 1 09:33:44 2009
@@ -409,8 +409,9 @@ typedef JSUint8 JSPackedBool;
typedef JSInt64 JSWord;
typedef JSUint64 JSUword;
#else
-typedef long JSWord;
-typedef unsigned long JSUword;
+#include <inttypes.h>
+typedef intptr_t JSWord;
+typedef uintptr_t JSUword;
#endif
#include "jsotypes.h"

6
lang/spidermonkey/pkg/PLIST
View File

@ -1,14 +1,16 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/10/01 23:02:12 steven Exp $
@comment $OpenBSD: PLIST,v 1.2 2009/05/05 21:01:55 martynas Exp $
%%SHARED%%
bin/js
@bin bin/js
include/js/
include/js/jsapi.h
include/js/jsautocfg.h
include/js/jscompat.h
include/js/jsconfig.h
include/js/jshash.h
include/js/jslong.h
include/js/jsosdep.h
include/js/jsotypes.h
include/js/jsproto.tbl
include/js/jsprvtd.h
include/js/jspubtd.h
include/js/jsstr.h