[Midnightbsd-cvs] mports [20438] trunk/lang/spidermonkey170: update
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 3 17:11:39 EDT 2015
Revision: 20438
http://svnweb.midnightbsd.org/mports/?rev=20438
Author: laffer1
Date: 2015-10-03 17:11:38 -0400 (Sat, 03 Oct 2015)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/lang/spidermonkey170/Makefile
trunk/lang/spidermonkey170/distinfo
Added Paths:
-----------
trunk/lang/spidermonkey170/files/patch-bug1041795
trunk/lang/spidermonkey170/files/patch-bug1046224
trunk/lang/spidermonkey170/files/patch-bug702179
trunk/lang/spidermonkey170/files/patch-bug784631
trunk/lang/spidermonkey170/files/patch-config_milestone.pl
Removed Paths:
-------------
trunk/lang/spidermonkey170/files/patch-Makefile
trunk/lang/spidermonkey170/files/patch-config
trunk/lang/spidermonkey170/files/patch-jslock.c
trunk/lang/spidermonkey170/files/patch-jsopcode.c
trunk/lang/spidermonkey170/files/patch-jsosdep.h
trunk/lang/spidermonkey170/files/patch-jsstr.c
trunk/lang/spidermonkey170/files/patch-warnings
Modified: trunk/lang/spidermonkey170/Makefile
===================================================================
--- trunk/lang/spidermonkey170/Makefile 2015-10-03 21:02:04 UTC (rev 20437)
+++ trunk/lang/spidermonkey170/Makefile 2015-10-03 21:11:38 UTC (rev 20438)
@@ -1,71 +1,88 @@
-# $MidnigghtBSD$
+# Created by: Kubilay Kocak <koobs at FreeBSD.org>
+# $FreeBSD: head/lang/spidermonkey170/Makefile 395171 2015-08-24 13:09:11Z marino $
+# $MidnightBSD$
-PORTNAME= spidermonkey
-DISTVERSION= 1.7.0
+PORTNAME= spidermonkey170
+PORTVERSION= 17.0.0
+PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= js
-DISTNAME= js-${DISTVERSION}
+MASTER_SITES= MOZILLA/js
+DISTNAME= mozjs${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
-COMMENT= A standalone JavaScript interpreter from the Mozilla project
+COMMENT= Standalone JavaScript based from Mozilla 17-esr
LICENSE= gpl2 mpl
LICENSE_COMB= dual
+BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr
-MAKE_ARGS+= JS_THREADSAFE=YES \
- PROG_LIBS="-lreadline -ltermcap -lm ${PTHREAD_LIBS}" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CFLAGS+= -I${LOCALBASE}/include/nspr
+CONFLICTS= njs-[0-9]*
-USE_GMAKE= YES
-MAKEFILE= Makefile.ref
-ALL_TARGET= ${OPSYS}`${UNAME} -r`_DBG.OBJ/js
-MAKE_ENV+= CCC="${CXX}"
+GNU_CONFIGURE= yes
+USES= gmake pathfix perl5 python:2,build
+USE_PERL5= build
USE_LDCONFIG= yes
-SRC_DIR= js/src
-JSH= jsapi.h jsarena.h jsarray.h jsatom.h jsautocfg.h jsbool.h \
- jsclist.h jscntxt.h jscompat.h jsconfig.h jsdate.h jsdhash.h \
- jsdtoa.h jsemit.h jsexn.h jsfun.h jsgc.h jshash.h jsinterp.h \
- jsiter.h jslibmath.h jslock.h jslong.h jsmath.h jsnum.h jsobj.h \
- jsopcode.h jsosdep.h jsotypes.h jsparse.h jsprf.h jsprvtd.h \
- jspubtd.h jsutil.h jsregexp.h jsscan.h jsscope.h jsscript.h \
- jsstr.h jstypes.h jsxdrapi.h jsxml.h \
- js.msg jsproto.tbl
+WRKSRC= ${WRKDIR}/mozjs${PORTVERSION}/js/src
-PLIST_FILES= bin/js lib/libjs.so lib/libjs.so.1 ${JSH:S,^,include/,}
-WRKSRC= ${WRKDIR}/${SRC_DIR}
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
- --exclude js/jsd
+CONFIGURE_ARGS= --with-pthreads \
+ --with-system-nspr
-OPTIONS= UTF8 "Enable UTF8 support" Off
+OPTIONS_DEFINE= DEBUG DTRACE GCZEAL JEMALLOC METHODJIT OPTIMIZE READLINE \
+ THREADSAFE TRACEJIT UTF8
+OPTIONS_DEFAULT= METHODJIT OPTIMIZE READLINE THREADSAFE TRACEJIT
+OPTIONS_SUB= yes
-.include <bsd.mport.options.mk>
+DEBUG_DESC= Enable Debug build
+DEBUG_CONFIGURE_ENABLE= debug debug-symbols
+DEBUG_CONFIGURE_DISABLE=debug
+DTRACE_DESC= Build with DTrace probes # move to bsd.options.desc.mk
+DTRACE_CONFIGURE_ENABLE=dtrace profiling
+DTRACE_LIBS= -lelf
+GCZEAL_DESC= Enable Zealous garbage collecting
+GCZEAL_CONFIGURE_ENABLE=gczeal
+JEMALLOC_DESC= Use jemalloc as memory allocator
+JEMALLOC_CONFIGURE_ENABLE= jemalloc
+METHODJIT_DESC= Enable method JIT support
+METHODJIT_CONFIGURE_ENABLE= methodjit
+OPTIMIZE_DESC= Enable compiler optimizations
+OPTIMIZE_CONFIGURE_ENABLE= optimize
+READLINE_DESC= Link js shell to system readline library
+READLINE_CONFIGURE_ENABLE= readline
+READLINE_USES= readline
+THREADSAFE_DESC= Enable multiple thread support
+THREADSAFE_CONFIGURE_ENABLE= threadsafe
+TRACEJIT_DESC= Enable tracing JIT support
+TRACEJIT_CONFIGURE_ENABLE= tracejit
+UTF8_DESC= Treat strings as UTF8 instead of ISO-8859-1
+UTF8_CFLAGS= -DJS_C_STRINGS_ARE_UTF8
-.if defined(WITH_UTF8)
-CFLAGS+= -DJS_C_STRINGS_ARE_UTF8
-.endif
+.include <bsd.port.pre.mk>
-do-configure:
- ${CP} ${WRKSRC}/config/Linux_All.mk \
- ${WRKSRC}/config/${OPSYS}`${UNAME} -r`.mk && \
+CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/js \
- ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/libjs.so \
- ${PREFIX}/lib
- ${LN} -sf ${PREFIX}/lib/libjs.so ${PREFIX}/lib/libjs.so.1
- ${CP} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/jsautocfg.h ${WRKSRC}
- @${INSTALL_DATA} ${JSH:S,^,${WRKSRC}/,} ${PREFIX}/include/
+.if ${PORT_OPTIONS:MDTRACE}
+. if ${OSVERSION} < 1000510
+BROKEN= dtrace -G crashes with C++ object files
+. endif
+STRIP_CMD= ${TRUE}
+.endif
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64" && ${OSVERSION} > 900000
-BROKEN= Does not build on sparc64-9: fails to link
+regression-test: build
+ @${ECHO_MSG} -n "===> Running jstests.py: "
+ @cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \
+ --no-progress ./js17
+.if ${PORT_OPTIONS:MMETHODJIT} || ${PORT_OPTIONS:MTRACEJIT}
+ @${ECHO_MSG} -n "===> Running jit_test.py: "
+ @cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} jit-test/jit_test.py \
+ --no-progress --jitflags=,m,j,mj,mjp,am,amj,amjp,amd ./js17
.endif
+post-install:
+ ${LN} -s libmozjs-17.0.so ${STAGEDIR}${PREFIX}/lib/libmozjs-17.0.so.1
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js17
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-17.0.*
+
.include <bsd.port.post.mk>
Modified: trunk/lang/spidermonkey170/distinfo
===================================================================
--- trunk/lang/spidermonkey170/distinfo 2015-10-03 21:02:04 UTC (rev 20437)
+++ trunk/lang/spidermonkey170/distinfo 2015-10-03 21:11:38 UTC (rev 20438)
@@ -1,2 +1,2 @@
-SHA256 (js-1.7.0.tar.gz) = 44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b
-SIZE (js-1.7.0.tar.gz) = 1165607
+SHA256 (mozjs17.0.0.tar.gz) = 321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba
+SIZE (mozjs17.0.0.tar.gz) = 6778934
Deleted: trunk/lang/spidermonkey170/files/patch-Makefile
===================================================================
--- trunk/lang/spidermonkey170/files/patch-Makefile 2015-10-03 21:02:04 UTC (rev 20437)
+++ trunk/lang/spidermonkey170/files/patch-Makefile 2015-10-03 21:11:38 UTC (rev 20438)
@@ -1,13 +0,0 @@
---- Makefile.ref 2006-07-26 21:16:47.000000000 +0200
-+++ Makefile.ref 2008-06-18 17:43:04.000000000 +0200
-@@ -335,8 +335,8 @@
- $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
- link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
- else
--$(PROGRAM): $(PROG_OBJS) $(LIBRARY)
-- $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
-+$(PROGRAM): $(PROG_OBJS) $(SHARED_LIBRARY)
-+ $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) -L$(OBJDIR) -ljs $(LDFLAGS) $(OTHER_LIBS) \
- $(PROG_LIBS)
- endif
-
Added: trunk/lang/spidermonkey170/files/patch-bug1041795
===================================================================
--- trunk/lang/spidermonkey170/files/patch-bug1041795 (rev 0)
+++ trunk/lang/spidermonkey170/files/patch-bug1041795 2015-10-03 21:11:38 UTC (rev 20438)
@@ -0,0 +1,35 @@
+diff --git js/src/config/rules.mk js/src/config/rules.mk
+index 4d67eda..783942f 100644
+--- config/rules.mk
++++ config/rules.mk
+@@ -869,7 +869,7 @@ ifdef DTRACE_PROBE_OBJ
+ ifndef DTRACE_LIB_DEPENDENT
+ NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS))
+ $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS)
+- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
++ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
+ endif
+ endif
+ endif
+@@ -886,7 +886,7 @@ ifndef INCREMENTAL_LINKER
+ endif
+ ifdef DTRACE_LIB_DEPENDENT
+ ifndef XP_MACOSX
+- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
++ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
+ endif
+ $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
+ @$(RM) $(DTRACE_PROBE_OBJ)
+diff --git js/src/Makefile.in js/src/Makefile.in
+index 28ca5e8..96793d7 100644
+--- Makefile.in
++++ Makefile.in
+@@ -906,7 +906,7 @@ endif
+
+ ifdef HAVE_DTRACE
+ $(CURDIR)/javascript-trace.h: $(srcdir)/javascript-trace.d
+- dtrace -h -s $(srcdir)/javascript-trace.d -o javascript-trace.h.in
++ dtrace -x nolibs -h -s $(srcdir)/javascript-trace.d -o javascript-trace.h.in
+ sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
+ -e '/const/!s/char \*/const char */g' \
+ javascript-trace.h.in > javascript-trace.h
Property changes on: trunk/lang/spidermonkey170/files/patch-bug1041795
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/lang/spidermonkey170/files/patch-bug1046224
===================================================================
--- trunk/lang/spidermonkey170/files/patch-bug1046224 (rev 0)
+++ trunk/lang/spidermonkey170/files/patch-bug1046224 2015-10-03 21:11:38 UTC (rev 20438)
@@ -0,0 +1,32 @@
+diff --git js/src/configure js/src/configure
+index 59d69c7..779a50f 100644
+--- configure
++++ configure
+@@ -10204,7 +10204,13 @@ cross_compiling=$ac_cv_prog_cc_cross
+ # Check whether --enable-dtrace or --disable-dtrace was given.
+ if test "${enable_dtrace+set}" = set; then
+ enableval="$enable_dtrace"
+- enable_dtrace="yes"
++ if test "$enableval" = "yes"; then
++ enable_dtrace="yes"
++ elif test "$enableval" = "no"; then
++ :
++ else
++ { echo "configure: error: Option, dtrace, does not take an argument ($enableval)." 1>&2; exit 1; }
++ fi
+ fi
+
+ if test "x$enable_dtrace" = "xyes"; then
+diff --git js/src/configure.in js/src/configure.in
+index 59d69c7..779a50f 100644
+--- configure.in
++++ configure.in
+@@ -2153,7 +2153,7 @@ dnl Quota support
+ MOZ_CHECK_HEADERS(sys/quota.h)
+ MOZ_CHECK_HEADERS(linux/quota.h)
+
+-AC_ARG_ENABLE(dtrace,
++MOZ_ARG_ENABLE_BOOL(dtrace,
+ [ --enable-dtrace build with dtrace support if available (default=no)],
+ [enable_dtrace="yes"],)
+ if test "x$enable_dtrace" = "xyes"; then
Property changes on: trunk/lang/spidermonkey170/files/patch-bug1046224
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/lang/spidermonkey170/files/patch-bug702179
===================================================================
--- trunk/lang/spidermonkey170/files/patch-bug702179 (rev 0)
+++ trunk/lang/spidermonkey170/files/patch-bug702179 2015-10-03 21:11:38 UTC (rev 20438)
@@ -0,0 +1,23 @@
+diff --git js/src/Makefile.in js/src/Makefile.in
+index e28160a..28ca5e8 100644
+--- Makefile.in
++++ Makefile.in
+@@ -57,7 +57,6 @@ ifdef JS_SHARED_LIBRARY
+ FORCE_SHARED_LIB = 1
+ endif
+ FORCE_STATIC_LIB = 1
+-DIST_INSTALL = 1
+
+ VPATH = \
+ $(srcdir) \
+@@ -857,8 +856,8 @@ install:: $(EXPORTS_mozilla)
+ install:: $(SCRIPTS)
+ $(SYSINSTALL) $^ $(DESTDIR)$(bindir)
+
+-install:: $(REAL_LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
+-ifneq (,$(REAL_LIBRARY))
++install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
++ifdef DIST_INSTALL
+ $(SYSINSTALL) $(REAL_LIBRARY) $(DESTDIR)$(libdir)
+ mv -f $(DESTDIR)$(libdir)/$(REAL_LIBRARY) $(subst $(STATIC_LIBRARY_NAME),$(LIBRARY_NAME),$(DESTDIR)$(libdir)/$(REAL_LIBRARY))
+ endif
Property changes on: trunk/lang/spidermonkey170/files/patch-bug702179
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/lang/spidermonkey170/files/patch-bug784631
===================================================================
--- trunk/lang/spidermonkey170/files/patch-bug784631 (rev 0)
+++ trunk/lang/spidermonkey170/files/patch-bug784631 2015-10-03 21:11:38 UTC (rev 20438)
@@ -0,0 +1,52 @@
+commit 66b3921
+Author: Terrence Cole <terrence at mozilla.com>
+Date: Tue Sep 11 12:31:04 2012 -0700
+
+ Bug 784631 - Fix some clang build errors in SpiderMonkey; r=Waldo f=espindola
+
+ Computed gotos are not in the C++ standard: clang and gcc differ on semantics.
+---
+ js/src/jsinterp.cpp | 3 ++-
+ js/src/jsutil.h | 8 ++++----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git js/src/jsinterp.cpp js/src/jsinterp.cpp
+index 0094c72..27a64a7 100644
+--- js/src/jsinterp.cpp
++++ jsinterp.cpp
+@@ -1231,6 +1231,7 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
+ RootedPropertyName rootName0(cx);
+ RootedId rootId0(cx);
+ RootedShape rootShape0(cx);
++ DebugOnly<uint32_t> blockDepth;
+
+ if (!entryFrame)
+ entryFrame = regs.fp();
+@@ -3650,7 +3651,7 @@ BEGIN_CASE(JSOP_LEAVEBLOCK)
+ BEGIN_CASE(JSOP_LEAVEFORLETIN)
+ BEGIN_CASE(JSOP_LEAVEBLOCKEXPR)
+ {
+- DebugOnly<uint32_t> blockDepth = regs.fp()->blockChain().stackDepth();
++ blockDepth = regs.fp()->blockChain().stackDepth();
+
+ regs.fp()->popBlock(cx);
+
+diff --git js/src/jsutil.h js/src/jsutil.h
+index 8838b6f..016a877 100644
+--- js/src/jsutil.h
++++ jsutil.h
+@@ -432,10 +432,10 @@ typedef size_t jsbitmap;
+ #if defined(__clang__)
+ # define JS_SILENCE_UNUSED_VALUE_IN_EXPR(expr) \
+ JS_BEGIN_MACRO \
+- _Pragma("clang diagnostic push") \
+- _Pragma("clang diagnostic ignored \"-Wunused-value\"") \
+- expr; \
+- _Pragma("clang diagnostic pop") \
++ _Pragma("(clang diagnostic push)") \
++ _Pragma("(clang diagnostic ignored \"-Wunused-value\")") \
++ {expr;} \
++ _Pragma("(clang diagnostic pop)") \
+ JS_END_MACRO
+ #elif (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+ # define JS_SILENCE_UNUSED_VALUE_IN_EXPR(expr) \
Property changes on: trunk/lang/spidermonkey170/files/patch-bug784631
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/lang/spidermonkey170/files/patch-config
===================================================================
--- trunk/lang/spidermonkey170/files/patch-config 2015-10-03 21:02:04 UTC (rev 20437)
+++ trunk/lang/spidermonkey170/files/patch-config 2015-10-03 21:11:38 UTC (rev 20438)
@@ -1,43 +0,0 @@
---- config/Linux_All.mk 2005-05-10 21:53:44.000000000 +0200
-+++ config/Linux_All.mk 2008-06-18 14:26:06.000000000 +0200
-@@ -41,8 +41,8 @@
- # Config for all versions of Linux
- #
-
--CC = gcc
--CCC = g++
-+CC ?= gcc
-+CCC ?= g++
- CFLAGS += -Wall -Wno-format
- OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
-
-@@ -74,7 +74,7 @@
-
- GFX_ARCH = x
-
--OS_LIBS = -lm -lc
-+OS_LIBS = -lm
-
- ASFLAGS += -x assembler-with-cpp
-
-@@ -88,16 +88,12 @@
- endif
-
- # Use the editline library to provide line-editing support.
--JS_EDITLINE = 1
-+JS_READLINE = 1
-
--ifeq ($(CPU_ARCH),x86_64)
--# Use VA_COPY() standard macro on x86-64
--# FIXME: better use it everywhere
- OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
--endif
-
--ifeq ($(CPU_ARCH),x86_64)
--# We need PIC code for shared libraries
--# FIXME: better patch rules.mk & fdlibm/Makefile*
-+ifeq ($(CPU_ARCH),sparc64)
- OS_CFLAGS += -DPIC -fPIC
-+else
-+OS_CFLAGS += -DPIC -fpic
- endif
Added: trunk/lang/spidermonkey170/files/patch-config_milestone.pl
===================================================================
--- trunk/lang/spidermonkey170/files/patch-config_milestone.pl (rev 0)
+++ trunk/lang/spidermonkey170/files/patch-config_milestone.pl 2015-10-03 21:11:38 UTC (rev 20438)
@@ -0,0 +1,11 @@
+--- config/milestone.pl.orig 2013-02-11 22:33:22 UTC
++++ config/milestone.pl
+@@ -55,7 +55,7 @@ $MILESTONE_FILE = "$TOPSRCDIR/config/mi
+ #
+ my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
+
+-if (defined(@TEMPLATE_FILE)) {
++if (@TEMPLATE_FILE) {
+ my $TFILE;
+
+ foreach $TFILE (@TEMPLATE_FILE) {
Property changes on: trunk/lang/spidermonkey170/files/patch-config_milestone.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/lang/spidermonkey170/files/patch-jslock.c
===================================================================
--- trunk/lang/spidermonkey170/files/patch-jslock.c 2015-10-03 21:02:04 UTC (rev 20437)
+++ trunk/lang/spidermonkey170/files/patch-jslock.c 2015-10-03 21:11:38 UTC (rev 20438)
@@ -1,12 +0,0 @@
---- jslock.c 2007-03-29 23:55:35.000000000 +0200
-+++ jslock.c 2008-06-19 16:08:19.000000000 +0200
-@@ -224,7 +224,9 @@
- #endif
- }
-
-+#ifndef NSPR_LOCK
- static void js_Dequeue(JSThinLock *);
-+#endif
-
- #ifdef DEBUG_SCOPE_COUNT
-
Deleted: trunk/lang/spidermonkey170/files/patch-jsopcode.c
===================================================================
--- trunk/lang/spidermonkey170/files/patch-jsopcode.c 2015-10-03 21:02:04 UTC (rev 20437)
+++ trunk/lang/spidermonkey170/files/patch-jsopcode.c 2015-10-03 21:11:38 UTC (rev 20438)
@@ -1,11 +0,0 @@
---- jsopcode.c 2007-09-27 20:30:18.000000000 +0200
-+++ jsopcode.c 2008-06-19 16:10:44.000000000 +0200
-@@ -262,7 +262,7 @@
- pc2 += jmplen;
- npairs = GET_ATOM_INDEX(pc2);
- pc2 += ATOM_INDEX_LEN;
-- fprintf(fp, " offset %d npairs %u", off, (uintN) npairs);
-+ fprintf(fp, " offset %td npairs %u", off, (uintN) npairs);
- while (npairs) {
- atom = GET_ATOM(cx, script, pc2);
- pc2 += ATOM_INDEX_LEN;
Deleted: trunk/lang/spidermonkey170/files/patch-jsosdep.h
===================================================================
--- trunk/lang/spidermonkey170/files/patch-jsosdep.h 2015-10-03 21:02:04 UTC (rev 20437)
+++ trunk/lang/spidermonkey170/files/patch-jsosdep.h 2015-10-03 21:11:38 UTC (rev 20438)
@@ -1,11 +0,0 @@
---- jsosdep.h 2006-07-07 04:12:02.000000000 +0200
-+++ jsosdep.h 2008-06-19 16:32:12.000000000 +0200
-@@ -89,7 +89,7 @@
- #elif defined(SOLARIS)
- #define JS_HAVE_LONG_LONG
-
--#elif defined(FREEBSD)
-+#elif defined(FREEBSD) || defined(__FreeBSD__)
- #define JS_HAVE_LONG_LONG
-
- #elif defined(SUNOS4)
Deleted: trunk/lang/spidermonkey170/files/patch-jsstr.c
===================================================================
--- trunk/lang/spidermonkey170/files/patch-jsstr.c 2015-10-03 21:02:04 UTC (rev 20437)
+++ trunk/lang/spidermonkey170/files/patch-jsstr.c 2015-10-03 21:11:38 UTC (rev 20438)
@@ -1,11 +0,0 @@
---- jsstr.c 2006-11-22 09:28:44.000000000 +0100
-+++ jsstr.c 2008-06-19 16:14:49.000000000 +0200
-@@ -1815,6 +1815,8 @@
- jsint i, j;
- uint32 len, limit;
-
-+ bzero(&tmp,sizeof(tmp));
-+
- str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
- if (!str)
- return JS_FALSE;
Deleted: trunk/lang/spidermonkey170/files/patch-warnings
===================================================================
--- trunk/lang/spidermonkey170/files/patch-warnings 2015-10-03 21:02:04 UTC (rev 20437)
+++ trunk/lang/spidermonkey170/files/patch-warnings 2015-10-03 21:11:38 UTC (rev 20438)
@@ -1,118 +0,0 @@
---- jsdtoa.c 2007-01-18 00:56:12.000000000 +0100
-+++ jsdtoa.c 2008-06-19 16:34:02.000000000 +0200
-@@ -247,7 +247,8 @@
- #define word1(x) JSDOUBLE_LO32(x)
- #define set_word1(x, y) JSDOUBLE_SET_LO32(x, y)
-
--#define Storeinc(a,b,c) (*(a)++ = (b) << 16 | (c) & 0xffff)
-+#define Storeinc(a,b,c) (*(a)++ = (b) << 16 | ((c) & 0xffff))
-+
-
- /* #define P DBL_MANT_DIG */
- /* Ten_pmax = floor(P*log(2)/log(5)) */
---- jspubtd.h 2007-06-23 01:13:21.000000000 +0200
-+++ jspubtd.h 2008-06-19 16:26:08.000000000 +0200
-@@ -616,7 +616,7 @@
- typedef JSBool
- (* JS_DLL_CALLBACK JSArgumentFormatter)(JSContext *cx, const char *format,
- JSBool fromJS, jsval **vpp,
-- va_list *app);
-+ va_list app);
- #endif
-
- typedef JSBool
---- jsapi.c 2007-10-03 16:36:48.000000000 +0200
-+++ jsapi.c 2008-06-19 17:17:52.000000000 +0200
-@@ -134,7 +134,7 @@
-
- static JSBool
- TryArgumentFormatter(JSContext *cx, const char **formatp, JSBool fromJS,
-- jsval **vpp, va_list *app)
-+ jsval **vpp, va_list app)
- {
- const char *format;
- JSArgumentFormatMap *map;
-@@ -263,8 +263,7 @@
- break;
- default:
- format--;
-- if (!TryArgumentFormatter(cx, &format, JS_TRUE, &sp,
-- JS_ADDRESSOF_VA_LIST(ap))) {
-+ if (!TryArgumentFormatter(cx, &format, JS_TRUE, &sp, ap)) {
- return JS_FALSE;
- }
- /* NB: the formatter already updated sp, so we continue here. */
-@@ -366,8 +365,7 @@
- break;
- default:
- format--;
-- if (!TryArgumentFormatter(cx, &format, JS_FALSE, &sp,
-- JS_ADDRESSOF_VA_LIST(ap))) {
-+ if (!TryArgumentFormatter(cx, &format, JS_FALSE, &sp, ap)) {
- goto bad;
- }
- /* NB: the formatter already updated sp, so we continue here. */
---- js.c 2007-04-20 20:45:18.000000000 +0200
-+++ js.c 2008-06-19 18:17:29.000000000 +0200
-@@ -978,7 +978,7 @@
- }
- }
- }
-- fprintf(gOutFile, "%3u: %5u [%4u] %-8s",
-+ fprintf(gOutFile, "%3tu: %5u [%4u] %-8s",
- PTRDIFF(sn, notes, jssrcnote), offset, delta, name);
- switch (type) {
- case SRC_SETLINE:
---- jscntxt.h 2007-04-06 22:53:21.000000000 +0200
-+++ jscntxt.h 2008-06-19 18:36:28.000000000 +0200
-@@ -598,7 +598,7 @@
-
- #define JS_PUSH_TEMP_ROOT(cx,cnt,arr,tvr) \
- JS_BEGIN_MACRO \
-- JS_ASSERT((ptrdiff_t)(cnt) >= 0); \
-+ JS_ASSERT((int)(cnt) >= 0); \
- (tvr)->count = (ptrdiff_t)(cnt); \
- (tvr)->u.array = (arr); \
- JS_PUSH_TEMP_ROOT_COMMON(cx, tvr); \
---- jsxml.c 2007-04-19 04:18:25.000000000 +0200
-+++ jsxml.c 2008-06-19 18:49:44.000000000 +0200
-@@ -1058,7 +1058,10 @@
- free(array->vector);
- vector = NULL;
- } else {
-- if ((size_t)capacity > ~(size_t)0 / sizeof(void *) ||
-+ if (
-+#if JS_BITS_PER_WORD == 32
-+ (size_t)capacity > ~(size_t)0 / sizeof(void *) ||
-+#endif
- !(vector = (void **)
- realloc(array->vector, capacity * sizeof(void *)))) {
- if (cx)
-@@ -1153,7 +1156,10 @@
- JS_CEILING_LOG2(log2, capacity);
- capacity = JS_BIT(log2);
- }
-- if ((size_t)capacity > ~(size_t)0 / sizeof(void *) ||
-+ if (
-+#if JS_BITS_PER_WORD == 32
-+ (size_t)capacity > ~(size_t)0 / sizeof(void *) ||
-+#endif
- !(vector = (void **)
- realloc(array->vector, capacity * sizeof(void *)))) {
- JS_ReportOutOfMemory(cx);
---- jsarray.c 2007-09-29 01:29:52.000000000 +0200
-+++ jsarray.c 2008-06-19 19:12:02.000000000 +0200
-@@ -1051,10 +1051,12 @@
- * Check that its size does not overflow size_t, which would allow for
- * indexing beyond the end of the malloc'd vector.
- */
-- if (len > ((size_t) -1) / sizeof(jsval)) {
-+#if JS_BITS_PER_WORD == 32
-+ if ((size_t)len > ~(size_t)0 / sizeof(jsval)) {
- JS_ReportOutOfMemory(cx);
- return JS_FALSE;
- }
-+#endif
-
- vec = (jsval *) JS_malloc(cx, ((size_t) len) * sizeof(jsval));
- if (!vec)
More information about the Midnightbsd-cvs
mailing list