Index: head/lang/spidermonkey170/Makefile =================================================================== --- head/lang/spidermonkey170/Makefile (revision 378144) +++ head/lang/spidermonkey170/Makefile (revision 378145) @@ -1,76 +1,87 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= spidermonkey170 PORTVERSION= 17.0.0 PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= js DISTNAME= mozjs${PORTVERSION} MAINTAINER= kwm@FreeBSD.org COMMENT= Standalone JavaScript based from Mozilla 17-esr BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr CONFLICTS= njs-[0-9]* GNU_CONFIGURE= yes USES= gmake pathfix perl5 python:2,build USE_PERL5= build USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/mozjs${PORTVERSION}/js/src CONFIGURE_ARGS= --with-pthreads \ --with-system-nspr -OPTIONS_DEFINE= DEBUG GCZEAL JEMALLOC METHODJIT OPTIMIZE READLINE \ +OPTIONS_DEFINE= DEBUG DTRACE GCZEAL JEMALLOC METHODJIT OPTIMIZE READLINE \ THREADSAFE TRACEJIT UTF8 OPTIONS_DEFAULT= METHODJIT OPTIMIZE READLINE THREADSAFE TRACEJIT +OPTIONS_SUB= yes 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 .include .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} +.endif + +.if ${PORT_OPTIONS:MDTRACE} +. if ${OSVERSION} < 1000510 +BROKEN= dtrace -G crashes with C++ object files +. endif +STRIP_CMD= ${TRUE} .endif 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 Index: head/lang/spidermonkey170/files/patch-bug1041795 =================================================================== --- head/lang/spidermonkey170/files/patch-bug1041795 (nonexistent) +++ head/lang/spidermonkey170/files/patch-bug1041795 (revision 378145) @@ -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: head/lang/spidermonkey170/files/patch-bug1041795 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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 Index: head/lang/spidermonkey170/files/patch-bug1046224 =================================================================== --- head/lang/spidermonkey170/files/patch-bug1046224 (nonexistent) +++ head/lang/spidermonkey170/files/patch-bug1046224 (revision 378145) @@ -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: head/lang/spidermonkey170/files/patch-bug1046224 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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 Index: head/lang/spidermonkey170/files/patch-bug702179 =================================================================== --- head/lang/spidermonkey170/files/patch-bug702179 (nonexistent) +++ head/lang/spidermonkey170/files/patch-bug702179 (revision 378145) @@ -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: head/lang/spidermonkey170/files/patch-bug702179 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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 Index: head/lang/spidermonkey170/pkg-plist =================================================================== --- head/lang/spidermonkey170/pkg-plist (revision 378144) +++ head/lang/spidermonkey170/pkg-plist (revision 378145) @@ -1,68 +1,68 @@ 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 +%%DTRACE%%include/js-17.0/javascript-trace.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