Attachment #152410 for bug #192614

Lines 33-44 post-configure: Link Here

(-)lang/spidermonkey185/Makefile (-1 / +13 lines)
33	${ECHO_CMD} "fenv.h" >> ${WRKSRC}/config/system-headers	33	${ECHO_CMD} "fenv.h" >> ${WRKSRC}/config/system-headers
34	${ECHO_CMD} "pthread_np.h" >> ${WRKSRC}/config/system-headers	34	${ECHO_CMD} "pthread_np.h" >> ${WRKSRC}/config/system-headers
35		35
36	OPTIONS_DEFINE= DEBUG GCZEAL JEMALLOC METHODJIT OPTIMIZE READLINE \	36	OPTIONS_DEFINE= DEBUG DTRACE GCZEAL JEMALLOC METHODJIT OPTIMIZE READLINE \
37	THREADSAFE TRACEJIT UTF8 \	37	THREADSAFE TRACEJIT UTF8 \
38		38
39	OPTIONS_DEFAULT= METHODJIT OPTIMIZE READLINE THREADSAFE TRACEJIT	39	OPTIONS_DEFAULT= METHODJIT OPTIMIZE READLINE THREADSAFE TRACEJIT
		40	OPTIONS_SUB= yes
40		41
41	DEBUG_DESC= Enable Debug build	42	DEBUG_DESC= Enable Debug build
		43	DTRACE_DESC= Build with DTrace probes # move to bsd.options.desc.mk
42	GCZEAL_DESC= Enable Zealous garbage collecting	44	GCZEAL_DESC= Enable Zealous garbage collecting
43	JEMALLOC_DESC= Use jemalloc as memory allocator	45	JEMALLOC_DESC= Use jemalloc as memory allocator
44	METHODJIT_DESC= Enable method JIT support	46	METHODJIT_DESC= Enable method JIT support
Lines 50-55 UTF8_DESC= Treat strings as UTF8 instead of ISO-8 Link Here
50		52
51	DEBUG_CONFIGURE_ENABLE= debug	53	DEBUG_CONFIGURE_ENABLE= debug
52	DEBUG_CONFIGURE_ON= --enable-debug-sumbols	54	DEBUG_CONFIGURE_ON= --enable-debug-sumbols
		55	DTRACE_CONFIGURE_ENABLE= dtrace profiling
		56	DTRACE_MAKE_ENV_OFF= DIST_INSTALL=1
		57	DTRACE_LIBS= -lelf
53	GCZEAL_CONFIGURE_ENABLE= gczeal	58	GCZEAL_CONFIGURE_ENABLE= gczeal
54	JEMALLOC_CONFIGURE_ENABLE= jemalloc	59	JEMALLOC_CONFIGURE_ENABLE= jemalloc
55	METHODJIT_CONFIGURE_ENABLE= methodjit	60	METHODJIT_CONFIGURE_ENABLE= methodjit
Lines 106-111 PLIST_SUB+= SPARC="" Link Here
106	PLIST_SUB+= SPARC="@comment "	111	PLIST_SUB+= SPARC="@comment "
107	.endif	112	.endif
108		113
		114	.if ${PORT_OPTIONS:MDTRACE}
		115	. if ${OSVERSION} < 1000510
		116	BROKEN= dtrace -G crashes with C++ object files
		117	. endif
		118	STRIP_CMD= ${TRUE}
		119	.endif
		120
109	pre-configure:	121	pre-configure:
110	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)	122	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
111		123




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




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




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

Lines 18-23 include/js/RegAlloc.h Link Here

(-)lang/spidermonkey185/pkg-plist (-1 / +2 lines)
18	include/js/VMPI.h	18	include/js/VMPI.h
19	include/js/Writer.h	19	include/js/Writer.h
20	include/js/avmplus.h	20	include/js/avmplus.h
		21	%%DTRACE%%include/js/javascript-trace.h
21	include/js/js-config.h	22	include/js/js-config.h
22	include/js/js.msg	23	include/js/js.msg
23	include/js/jsanalyze.h	24	include/js/jsanalyze.h
Lines 99-105 include/js/njconfig.h Link Here
99	include/js/njcpudetect.h	100	include/js/njcpudetect.h
100	include/js/prmjtime.h	101	include/js/prmjtime.h
101	lib/libmozjs185.so	102	lib/libmozjs185.so
102	lib/libmozjs185-1.0.a	103	%%NO_DTRACE%%lib/libmozjs185-1.0.a
103	lib/libmozjs185.so.1.0.0	104	lib/libmozjs185.so.1.0.0
104	lib/libmozjs185.so.1.0	105	lib/libmozjs185.so.1.0
105	lib/libmozjs185.so.1	106	lib/libmozjs185.so.1

Return to bug 192614

Line 0 Link Here

(-)lang/spidermonkey185/files/patch-bug1041795 (+35 lines)
	1	diff --git js/src/config/rules.mk js/src/config/rules.mk
	2	index 4d67eda..783942f 100644
	3	--- config/rules.mk
	4	+++ config/rules.mk
	5	@@ -1275,7 +1275,7 @@ ifndef XP_MACOSX
	6	ifdef DTRACE_PROBE_OBJ
	7	ifndef DTRACE_LIB_DEPENDENT
	8	$(DTRACE_PROBE_OBJ): $(OBJS)
	9	- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(OBJS)
	10	+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(OBJS)
	11	endif
	12	endif
	13	endif
	14	@@ -1327,7 +1327,7 @@ ifdef DTRACE_LIB_DEPENDENT
	15	@rm -f $(PROBE_LOBJS)
	16	@for lib in $(MOZILLA_PROBE_LIBS); do $(AR_EXTRACT) $${lib}; $(CLEANUP2); done
	17	ifndef XP_MACOSX
	18	- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(PROBE_LOBJS)
	19	+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(PROBE_LOBJS)
	20	endif
	21	@for lib in $(MOZILLA_PROBE_LIBS); do \
	22	ofiles=`$(AR_LIST) $${lib}`; \
	23	diff --git js/src/Makefile.in js/src/Makefile.in
	24	index 28ca5e8..96793d7 100644
	25	--- Makefile.in
	26	+++ Makefile.in
	27	@@ -916,7 +916,7 @@ $(patsubst %.cc,%.$(OBJ_SUFFIX),$(CPPSRC
	28
	29	ifdef HAVE_DTRACE
	30	$(CURDIR)/javascript-trace.h: $(srcdir)/javascript-trace.d
	31	- dtrace -h -s $(srcdir)/javascript-trace.d -o javascript-trace.h.in
	32	+ dtrace -x nolibs -h -s $(srcdir)/javascript-trace.d -o javascript-trace.h.in
	33	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
	34	-e '/const/!s/char \/const char /g' \
	35	javascript-trace.h.in > javascript-trace.h

Line 0 Link Here

(-)lang/spidermonkey185/files/patch-bug1046224 (+32 lines)
	1	diff --git js/src/configure js/src/configure
	2	index 59d69c7..779a50f 100644
	3	--- configure
	4	+++ configure
	5	@@ -10107,7 +10107,13 @@ cross_compiling=$ac_cv_prog_cc_cross
	6	# Check whether --enable-dtrace or --disable-dtrace was given.
	7	if test "${enable_dtrace+set}" = set; then
	8	enableval="$enable_dtrace"
	9	- enable_dtrace="yes"
	10	+ if test "$enableval" = "yes"; then
	11	+ enable_dtrace="yes"
	12	+ elif test "$enableval" = "no"; then
	13	+ :
	14	+ else
	15	+ { echo "configure: error: Option, dtrace, does not take an argument ($enableval)." 1>&2; exit 1; }
	16	+ fi
	17	fi
	18
	19	if test "x$enable_dtrace" = "xyes"; then
	20	diff --git js/src/configure.in js/src/configure.in
	21	index 59d69c7..779a50f 100644
	22	--- configure.in
	23	+++ configure.in
	24	@@ -2153,7 +2153,7 @@ dnl Quota support
	25	MOZ_CHECK_HEADERS(sys/quota.h)
	26	MOZ_CHECK_HEADERS(linux/quota.h)
	27
	28	-AC_ARG_ENABLE(dtrace,
	29	+MOZ_ARG_ENABLE_BOOL(dtrace,
	30	[ --enable-dtrace build with dtrace support if available (default=no)],
	31	[enable_dtrace="yes"],)
	32	if test "x$enable_dtrace" = "xyes"; then

Line 0 Link Here

(-)lang/spidermonkey185/files/patch-bug702179 (+38 lines)
	1	diff --git js/src/shell/Makefile.in js/src/shell/Makefile.in
	2	index e28160a..28ca5e8 100644
	3	--- shell/Makefile.in
	4	+++ shell/Makefile.in
	5	@@ -54,6 +54,12 @@
	6
	7	LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX)
	8
	9	+ifdef HAVE_DTRACE
	10	+ifneq ($(OS_ARCH),Darwin)
	11	+LIBS += ../mozjs185-dtrace.$(OBJ_SUFFIX)
	12	+endif
	13	+endif
	14	+
	15	LOCAL_INCLUDES += -I$(topsrcdir) -I..
	16
	17	ifdef _MSC_VER
	18	diff --git js/src/Makefile.in js/src/Makefile.in
	19	index e28160a..28ca5e8 100644
	20	--- Makefile.in
	21	+++ Makefile.in
	22	@@ -128,7 +128,6 @@ ifdef JS_SHARED_LIBRARY
	23	FORCE_SHARED_LIB = 1
	24	endif
	25	FORCE_STATIC_LIB = 1
	26	-DIST_INSTALL = 1
	27
	28	VPATH = $(srcdir)
	29
	30	@@ -876,7 +875,7 @@ endif
	31	endif
	32
	33	install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
	34	-ifneq (,$(LIBRARY))
	35	+ifdef DIST_INSTALL
	36	$(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
	37	mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs185-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
	38	endif