Attachment 145738 Details for Bug 192614 – js-1.8.x patch

[patch] js-1.8.x patch

spidermonkey185_dtrace.diff (text/plain), 7.33 KB, created by Jan Beich on 2014-08-12 23:38:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-08-12 23:38:21 UTC

Size: 7.33 KB

patch

obsolete

>Index: lang/spidermonkey185/Makefile
>===================================================================
>--- lang/spidermonkey185/Makefile	(revision 364748)
>+++ lang/spidermonkey185/Makefile	(working copy)
>@@ -34,12 +34,14 @@ 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 \
>+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
>+DTRACE_DESC=		Build with DTrace probes # move to bsd.options.desc.mk
> GCZEAL_DESC=		Enable Zealous garbage collecting
> JEMALLOC_DESC=		Use jemalloc as memory allocator
> METHODJIT_DESC=		Enable method JIT support
>@@ -51,6 +53,8 @@ UTF8_DESC=		Treat strings as UTF8 instead of ISO-8
> 
> DEBUG_CONFIGURE_ENABLE=	debug
> DEBUG_CONFIGURE_ON=	--enable-debug-sumbols
>+DTRACE_CONFIGURE_ENABLE=	dtrace profiling
>+DTRACE_LIBS=			-lelf
> GCZEAL_CONFIGURE_ENABLE=	gczeal
> JEMALLOC_CONFIGURE_ENABLE=	jemalloc
> METHODJIT_CONFIGURE_ENABLE=	methodjit
>@@ -107,6 +111,13 @@ PLIST_SUB+=	SPARC=""
> PLIST_SUB+=	SPARC="@comment "
> .endif
> 
>+.if ${PORT_OPTIONS:MDTRACE}
>+. if ${OSVERSION} < 1000510
>+BROKEN=			dtrace -G crashes with C++ object files
>+. endif
>+STRIP_CMD=	${TRUE}
>+.endif
>+
> pre-configure:
> 	(cd ${WRKSRC} && ${AUTOCONF})
> 
>Index: lang/spidermonkey185/files/patch-bug1041795
>===================================================================
>--- lang/spidermonkey185/files/patch-bug1041795	(revision 0)
>+++ lang/spidermonkey185/files/patch-bug1041795	(working copy)
>@@ -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
>+@@ -1275,7 +1275,7 @@ ifndef XP_MACOSX
>+ ifdef DTRACE_PROBE_OBJ
>+ ifndef DTRACE_LIB_DEPENDENT
>+ $(DTRACE_PROBE_OBJ): $(OBJS)
>+-	dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(OBJS)
>++	dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(OBJS)
>+ endif
>+ endif
>+ endif
>+@@ -1327,7 +1327,7 @@ ifdef DTRACE_LIB_DEPENDENT
>+ 	@rm -f $(PROBE_LOBJS)
>+ 	@for lib in $(MOZILLA_PROBE_LIBS); do $(AR_EXTRACT) $${lib}; $(CLEANUP2); done
>+ ifndef XP_MACOSX
>+-	dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o  $(DTRACE_PROBE_OBJ) $(PROBE_LOBJS)
>++	dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o  $(DTRACE_PROBE_OBJ) $(PROBE_LOBJS)
>+ endif
>+ 	@for lib in $(MOZILLA_PROBE_LIBS); do \
>+ 		ofiles=`$(AR_LIST) $${lib}`; \
>+diff --git js/src/Makefile.in js/src/Makefile.in
>+index 28ca5e8..96793d7 100644
>+--- Makefile.in
>++++ Makefile.in
>+@@ -916,7 +916,7 @@ $(patsubst %.cc,%.$(OBJ_SUFFIX),$(CPPSRC
>+ 
>+ 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: lang/spidermonkey185/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: lang/spidermonkey185/files/patch-bug1046224
>===================================================================
>--- lang/spidermonkey185/files/patch-bug1046224	(revision 0)
>+++ lang/spidermonkey185/files/patch-bug1046224	(working copy)
>@@ -0,0 +1,32 @@
>+diff --git js/src/configure js/src/configure
>+index 59d69c7..779a50f 100644
>+--- configure
>++++ configure
>+@@ -10107,7 +10107,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: lang/spidermonkey185/files/patch-bug1046224
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: lang/spidermonkey185/files/patch-bug702179
>===================================================================
>--- lang/spidermonkey185/files/patch-bug702179	(revision 0)
>+++ lang/spidermonkey185/files/patch-bug702179	(working copy)
>@@ -0,0 +1,38 @@
>+diff --git js/src/shell/Makefile.in js/src/shell/Makefile.in
>+index e28160a..28ca5e8 100644
>+--- shell/Makefile.in
>++++ shell/Makefile.in
>+@@ -54,6 +54,12 @@
>+ 
>+ LIBS      = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX)
>+ 
>++ifdef HAVE_DTRACE
>++ifneq ($(OS_ARCH),Darwin)
>++LIBS += ../mozjs185-dtrace.$(OBJ_SUFFIX)
>++endif
>++endif
>++
>+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
>+ 
>+ ifdef _MSC_VER
>+diff --git js/src/Makefile.in js/src/Makefile.in
>+index e28160a..28ca5e8 100644
>+--- Makefile.in
>++++ Makefile.in
>+@@ -128,7 +128,6 @@ ifdef JS_SHARED_LIBRARY
>+ FORCE_SHARED_LIB = 1
>+ endif
>+ FORCE_STATIC_LIB = 1
>+-DIST_INSTALL = 1
>+ 
>+ VPATH		= $(srcdir)
>+ 
>+@@ -876,7 +875,7 @@ endif
>+ endif
>+ 
>+ install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
>+-ifneq (,$(LIBRARY))
>++ifdef DIST_INSTALL
>+ 	$(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
>+ 	mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs185-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
>+ endif
>
>Property changes on: lang/spidermonkey185/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: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: lang/spidermonkey185/pkg-plist
>===================================================================
>--- lang/spidermonkey185/pkg-plist	(revision 364748)
>+++ lang/spidermonkey185/pkg-plist	(working copy)
>@@ -18,6 +18,7 @@ include/js/RegAlloc.h
> include/js/VMPI.h
> include/js/Writer.h
> include/js/avmplus.h
>+%%DTRACE%%include/js/javascript-trace.h
> include/js/js-config.h
> include/js/js.msg
> include/js/jsanalyze.h
>@@ -99,7 +100,6 @@ 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

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 192614: 145714 | 145715 | 145733 | 145734 | 145735 | 145736 | 145737 | 145738 | 145739 | 145740 | 152410