svn commit: r315532 - in head/lang: . spidermonkey170 spidermonkey170/files
Koop Mast
kwm at FreeBSD.org
Fri Mar 29 09:57:42 UTC 2013
Author: kwm
Date: Fri Mar 29 09:57:40 2013
New Revision: 315532
URL: http://svnweb.freebsd.org/changeset/ports/315532
Log:
Add spidermonkey 17.0
This is the spidermonkey version shipped with the firefox-esr series 17.0.
Not to be confused with spidermonkey17 ports which is 1.7.
Borrow patch from firefox-esr to fix the build with clang.
Added:
head/lang/spidermonkey170/
- copied from r315525, head/lang/spidermonkey185/
head/lang/spidermonkey170/files/
head/lang/spidermonkey170/files/patch-bug784631 (contents, props changed)
Modified:
head/lang/Makefile
head/lang/spidermonkey170/Makefile
head/lang/spidermonkey170/distinfo
head/lang/spidermonkey170/pkg-plist
Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile Fri Mar 29 09:49:21 2013 (r315531)
+++ head/lang/Makefile Fri Mar 29 09:57:40 2013 (r315532)
@@ -329,6 +329,7 @@
SUBDIR += sml-nj-devel
SUBDIR += snobol4
SUBDIR += spidermonkey17
+ SUBDIR += spidermonkey170
SUBDIR += spidermonkey185
SUBDIR += spl
SUBDIR += squeak
Modified: head/lang/spidermonkey170/Makefile
==============================================================================
--- head/lang/spidermonkey185/Makefile Fri Mar 29 08:04:19 2013 (r315525)
+++ head/lang/spidermonkey170/Makefile Fri Mar 29 09:57:40 2013 (r315532)
@@ -1,16 +1,15 @@
# Created by: Kubilay Kocak <koobs at FreeBSD.org>
# $FreeBSD$
-PORTNAME= spidermonkey185
-PORTVERSION= 1.8.5
-PORTREVISION= 1
+PORTNAME= spidermonkey
+PORTVERSION= 17.0.0
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= js
-DISTNAME= js185-1.0.0
+DISTNAME= mozjs${PORTVERSION}
-MAINTAINER= koobs at FreeBSD.org
-COMMENT= Standalone JavaScript (1.8.5) interpreter from Mozilla
+MAINTAINER= kwm at FreeBSD.org
+COMMENT= Standalone JavaScript based from Mozilla 17-esr
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= nspr4:${PORTSDIR}/devel/nspr
@@ -19,22 +18,17 @@ CONFLICTS= njs-[0-9]*
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack
+USES= pathfix
USE_LDCONFIG= yes
USE_PERL5_BUILD= yes
USE_PYTHON_BUILD= 2.5-2.7
MAKE_JOBS_SAFE= yes
-WRKSRC= ${WRKDIR}/js-${PORTVERSION}/js/src
+WRKSRC= ${WRKDIR}/mozjs${PORTVERSION}/js/src
CONFIGURE_ARGS= --with-pthreads \
--with-system-nspr
-# This comes from bsd.gecko.mk, fixes linking issues on 9.0 and higher.
-post-configure:
- ${ECHO_CMD} "fenv.h" >> ${WRKSRC}/config/system-headers
- ${ECHO_CMD} "pthread_np.h" >> ${WRKSRC}/config/system-headers
-
OPTIONS_DEFINE= DEBUG GCZEAL JEMALLOC METHODJIT OPTIMIZE READLINE \
THREADSAFE TRACEJIT UTF8 \
@@ -111,57 +105,17 @@ CFLAGS+= -DJS_C_STRINGS_ARE_UTF8
CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
.endif
-.if ${ARCH} == "sparc64" && ${OSVERSION} > 900000
-BROKEN= Does not build on sparc64-9: fails to link
-.endif
-
-.if ${ARCH} == "amd64"
-PLIST_SUB+= AMD64=""
-.else
-PLIST_SUB+= AMD64="@comment "
-.endif
-
-.if ${ARCH} == "i386"
-PLIST_SUB+= I386=""
-.else
-PLIST_SUB+= I386="@comment "
-.endif
-
-.if ${ARCH} == "arm"
-PLIST_SUB+= ARM=""
-.else
-PLIST_SUB+= ARM="@comment "
-.endif
-
-.if ${ARCH} == "mips"
-PLIST_SUB+= MIPS=""
-.else
-PLIST_SUB+= MIPS="@comment "
-.endif
-
-.if ${ARCH} == "powerpc" || ${ARCH} == "powerpc64"
-PLIST_SUB+= PPC=""
-.else
-PLIST_SUB+= PPC="@comment "
-.endif
-
-.if ${ARCH} == "sparc64"
-PLIST_SUB+= SPARC=""
-.else
-PLIST_SUB+= SPARC="@comment "
-.endif
-
regression-test: build
@${ECHO_MSG} -n "===> Running jstests.py: "
@cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \
- --no-progress ./js
+ --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 ./js
+ --no-progress --jitflags=,m,j,mj,mjp,am,amj,amjp,amd ./js17
.endif
post-install:
- ${LN} -s libmozjs185.so.1.0 ${PREFIX}/lib/libmozjs185.so.1
+ ${LN} -s libmozjs-17.0.so ${PREFIX}/lib/libmozjs-17.0.so.1
.include <bsd.port.post.mk>
Modified: head/lang/spidermonkey170/distinfo
==============================================================================
--- head/lang/spidermonkey185/distinfo Fri Mar 29 08:04:19 2013 (r315525)
+++ head/lang/spidermonkey170/distinfo Fri Mar 29 09:57:40 2013 (r315532)
@@ -1,2 +1,2 @@
-SHA256 (js185-1.0.0.tar.gz) = 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
-SIZE (js185-1.0.0.tar.gz) = 6164605
+SHA256 (mozjs17.0.0.tar.gz) = 321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba
+SIZE (mozjs17.0.0.tar.gz) = 6778934
Added: head/lang/spidermonkey170/files/patch-bug784631
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/spidermonkey170/files/patch-bug784631 Fri Mar 29 09:57:40 2013 (r315532)
@@ -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) \
Modified: head/lang/spidermonkey170/pkg-plist
==============================================================================
--- head/lang/spidermonkey185/pkg-plist Fri Mar 29 08:04:19 2013 (r315525)
+++ head/lang/spidermonkey170/pkg-plist Fri Mar 29 09:57:40 2013 (r315532)
@@ -1,108 +1,73 @@
-bin/js-config
-include/js/Allocator.h
-include/js/Assembler.h
-include/js/CodeAlloc.h
-include/js/Containers.h
-include/js/Fragmento.h
-include/js/LIR.h
-include/js/LIRopcode.tbl
-include/js/Native.h
-include/js/NativeCommon.h
-%%ARM%%/include/js/NativeARM.h
-%%MIPS%%/include/js/NativeMIPS.h
-%%PPC%%/include/js/NativePPC.h
-%%SPARC%%/include/js/NativeSparc.h
-%%AMD64%%include/js/NativeX64.h
-%%I386%%include/js/Nativei386.h
-include/js/RegAlloc.h
-include/js/VMPI.h
-include/js/Writer.h
-include/js/avmplus.h
-include/js/js-config.h
-include/js/js.msg
-include/js/jsanalyze.h
-include/js/jsapi.h
-include/js/jsarena.h
-include/js/jsarray.h
-include/js/jsatom.h
-include/js/jsautocfg.h
-include/js/jsautokw.h
-include/js/jsbit.h
-include/js/jsbool.h
-include/js/jsbuiltins.h
-include/js/jscell.h
-include/js/jsclist.h
-include/js/jsclone.h
-include/js/jscntxt.h
-include/js/jscompartment.h
-include/js/jscompat.h
-include/js/jsdate.h
-include/js/jsdbgapi.h
-include/js/jsdhash.h
-include/js/jsdtoa.h
-include/js/jsemit.h
-include/js/jsfriendapi.h
-include/js/jsfun.h
-include/js/jsgc.h
-include/js/jsgcchunk.h
-include/js/jsgcstats.h
-include/js/jshash.h
-include/js/jshashtable.h
-include/js/jshotloop.h
-include/js/jsinterp.h
-include/js/jsinttypes.h
-include/js/jsiter.h
-include/js/jslock.h
-include/js/jslong.h
-include/js/jsmath.h
-include/js/jsobj.h
-include/js/jsobjinlines.h
-include/js/json.h
-include/js/jsopcode.h
-include/js/jsopcode.tbl
-include/js/jsopcodeinlines.h
-include/js/jsotypes.h
-include/js/jsparse.h
-include/js/jsperf.h
-include/js/jsprf.h
-include/js/jsprobes.h
-include/js/jspropertycache.h
-include/js/jspropertycacheinlines.h
-include/js/jspropertytree.h
-include/js/jsproto.tbl
-include/js/jsproxy.h
-include/js/jsprvtd.h
-include/js/jspubtd.h
-include/js/jsreflect.h
-include/js/jsregexp.h
-include/js/jsscan.h
-include/js/jsscope.h
-include/js/jsscript.h
-include/js/jsscriptinlines.h
-include/js/jsstaticcheck.h
-include/js/jsstdint.h
-include/js/jsstr.h
-include/js/jstl.h
-include/js/jstracer.h
-include/js/jstypedarray.h
-include/js/jstypes.h
-include/js/jsutil.h
-include/js/jsval.h
-include/js/jsvalue.h
-include/js/jsvector.h
-include/js/jsversion.h
-include/js/jswrapper.h
-include/js/jsxdrapi.h
-include/js/jsxml.h
-include/js/nanojit.h
-include/js/njconfig.h
-include/js/njcpudetect.h
-include/js/prmjtime.h
-lib/libmozjs185.so
-lib/libmozjs185-1.0.a
-lib/libmozjs185.so.1.0.0
-lib/libmozjs185.so.1.0
-lib/libmozjs185.so.1
-libdata/pkgconfig/mozjs185.pc
- at dirrmtry libdata/pkgconfig
- at dirrm include/js
+bin/js17
+bin/js17-config
+include/js-17.0/ds/BitArray.h
+include/js-17.0/gc/Barrier.h
+include/js-17.0/gc/Heap.h
+include/js-17.0/gc/Root.h
+include/js-17.0/gc/Statistics.h
+include/js-17.0/gc/StoreBuffer.h
+include/js-17.0/js-config.h
+include/js-17.0/js.msg
+include/js-17.0/js/HashTable.h
+include/js-17.0/js/LegacyIntTypes.h
+include/js-17.0/js/MemoryMetrics.h
+include/js-17.0/js/RequiredDefines.h
+include/js-17.0/js/TemplateLib.h
+include/js-17.0/js/Utility.h
+include/js-17.0/js/Vector.h
+include/js-17.0/jsalloc.h
+include/js-17.0/jsapi.h
+include/js-17.0/jsatom.h
+include/js-17.0/jsatom.tbl
+include/js-17.0/jsclass.h
+include/js-17.0/jsclist.h
+include/js-17.0/jscpucfg.h
+include/js-17.0/jsdbgapi.h
+include/js-17.0/jsdhash.h
+include/js-17.0/jsfriendapi.h
+include/js-17.0/jsgc.h
+include/js-17.0/jslock.h
+include/js-17.0/json.h
+include/js-17.0/jsperf.h
+include/js-17.0/jsprf.h
+include/js-17.0/jsproto.tbl
+include/js-17.0/jsproxy.h
+include/js-17.0/jsprvtd.h
+include/js-17.0/jspubtd.h
+include/js-17.0/jstypes.h
+include/js-17.0/jsutil.h
+include/js-17.0/jsval.h
+include/js-17.0/jsversion.h
+include/js-17.0/jswrapper.h
+include/js-17.0/mozilla/Assertions.h
+include/js-17.0/mozilla/Attributes.h
+include/js-17.0/mozilla/BloomFilter.h
+include/js-17.0/mozilla/CheckedInt.h
+include/js-17.0/mozilla/Constants.h
+include/js-17.0/mozilla/FloatingPoint.h
+include/js-17.0/mozilla/GuardObjects.h
+include/js-17.0/mozilla/HashFunctions.h
+include/js-17.0/mozilla/Likely.h
+include/js-17.0/mozilla/LinkedList.h
+include/js-17.0/mozilla/MSStdInt.h
+include/js-17.0/mozilla/MathAlgorithms.h
+include/js-17.0/mozilla/NullPtr.h
+include/js-17.0/mozilla/RangedPtr.h
+include/js-17.0/mozilla/RefPtr.h
+include/js-17.0/mozilla/SHA1.h
+include/js-17.0/mozilla/Scoped.h
+include/js-17.0/mozilla/StandardInteger.h
+include/js-17.0/mozilla/ThreadLocal.h
+include/js-17.0/mozilla/TypeTraits.h
+include/js-17.0/mozilla/Types.h
+include/js-17.0/mozilla/Util.h
+include/js-17.0/mozilla/WeakPtr.h
+lib/libmozjs-17.0.a
+lib/libmozjs-17.0.so
+lib/libmozjs-17.0.so.1
+libdata/pkgconfig/mozjs-17.0.pc
+ at dirrm include/js-17.0/mozilla
+ at dirrm include/js-17.0/js
+ at dirrm include/js-17.0/gc
+ at dirrm include/js-17.0/ds
+ at dirrm include/js-17.0
More information about the svn-ports-head
mailing list