Attachment #145714 for bug #192614

Lines 28-41 WRKSRC= ${WRKDIR}/mozjs-${PORTVERSION}/js/src Link Here

(-)lang/spidermonkey24/Makefile (-1 / +12 lines)
28	CONFIGURE_ARGS= --with-pthreads \	28	CONFIGURE_ARGS= --with-pthreads \
29	--with-system-nspr	29	--with-system-nspr
30		30
31	OPTIONS_DEFINE= DEBUG GCZEAL JEMALLOC METHODJIT OPTIMIZE READLINE \	31	OPTIONS_DEFINE= DEBUG DTRACE GCZEAL JEMALLOC METHODJIT OPTIMIZE READLINE \
32	THREADSAFE TRACEJIT UTF8 \	32	THREADSAFE TRACEJIT UTF8 \
33		33
34	OPTIONS_DEFAULT= METHODJIT OPTIMIZE READLINE THREADSAFE TRACEJIT	34	OPTIONS_DEFAULT= METHODJIT OPTIMIZE READLINE THREADSAFE TRACEJIT
		35	OPTIONS_SUB= yes
35		36
36	DEBUG_DESC= Enable Debug build	37	DEBUG_DESC= Enable Debug build
37	DEBUG_CONFIGURE_ENABLE= debug debug-symbols	38	DEBUG_CONFIGURE_ENABLE= debug debug-symbols
38	DEBUG_CONFIGURE_DISABLE=debug	39	DEBUG_CONFIGURE_DISABLE=debug
		40	DTRACE_DESC= Build with DTrace probes # move to bsd.options.desc.mk
		41	DTRACE_CONFIGURE_ENABLE=dtrace profiling
		42	DTRACE_LIBS= -lelf
39	GCZEAL_DESC= Enable Zealous garbage collecting	43	GCZEAL_DESC= Enable Zealous garbage collecting
40	GCZEAL_CONFIGURE_ENABLE=gczeal	44	GCZEAL_CONFIGURE_ENABLE=gczeal
41	JEMALLOC_DESC= Use jemalloc as memory allocator	45	JEMALLOC_DESC= Use jemalloc as memory allocator
Lines 59-64 UTF8_CFLAGS= -DJS_C_STRINGS_ARE_UTF8 Link Here
59	CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}	63	CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
60	.endif	64	.endif
61		65
		66	.if ${PORT_OPTIONS:MDTRACE}
		67	. if ${OSVERSION} < 1000510
		68	BROKEN= dtrace -G crashes with C++ object files
		69	. endif
		70	STRIP_CMD= ${TRUE}
		71	.endif
		72
62	regression-test: build	73	regression-test: build
63	@${ECHO_MSG} -n "===> Running jstests.py: "	74	@${ECHO_MSG} -n "===> Running jstests.py: "
64	@cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \	75	@cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \




diff --git js/src/config/rules.mk js/src/config/rules.mk
index 4d67eda..783942f 100644
--- config/rules.mk
+++ config/rules.mk
@@ -858,7 +858,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
@@ -876,7 +876,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) $(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) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
 	@$(RM) $(DTRACE_PROBE_OBJ)
diff --git js/src/Makefile.in js/src/Makefile.in
index 28ca5e8..96793d7 100644
--- Makefile.in
+++ Makefile.in
@@ -342,7 +342,7 @@ endif
 
 ifdef HAVE_DTRACE
 $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d
-	dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
+	dtrace -x nolibs -h -s $(srcdir)/devtools/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/Makefile.in js/src/Makefile.in
index e28160a..28ca5e8 100644
--- Makefile.in
+++ Makefile.in
@@ -35,7 +35,6 @@ ifdef JS_SHARED_LIBRARY
 FORCE_SHARED_LIB = 1
 endif
 FORCE_STATIC_LIB = 1
-DIST_INSTALL = 1
 
 ###############################################
 # BEGIN include sources for low-level code shared with mfbt
@@ -584,8 +584,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

Lines 1-5 Link Here

(-)lang/spidermonkey24/pkg-plist (+1 lines)
1	bin/js24	1	bin/js24
2	bin/js24-config	2	bin/js24-config
		3	%%DTRACE%%include/mozjs-24/javascript-trace.h
3	include/mozjs-24/js-config.h	4	include/mozjs-24/js-config.h
4	include/mozjs-24/js.msg	5	include/mozjs-24/js.msg
5	include/mozjs-24/js/Anchor.h	6	include/mozjs-24/js/Anchor.h

Return to bug 192614

Line 0 Link Here

(-)lang/spidermonkey24/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	@@ -858,7 +858,7 @@ ifdef DTRACE_PROBE_OBJ
	6	ifndef DTRACE_LIB_DEPENDENT
	7	NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS))
	8	$(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS)
	9	- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
	10	+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
	11	endif
	12	endif
	13	endif
	14	@@ -876,7 +876,7 @@ ifndef INCREMENTAL_LINKER
	15	endif
	16	ifdef DTRACE_LIB_DEPENDENT
	17	ifndef XP_MACOSX
	18	- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
	19	+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
	20	endif
	21	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(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) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
	22	@$(RM) $(DTRACE_PROBE_OBJ)
	23	diff --git js/src/Makefile.in js/src/Makefile.in
	24	index 28ca5e8..96793d7 100644
	25	--- Makefile.in
	26	+++ Makefile.in
	27	@@ -342,7 +342,7 @@ endif
	28
	29	ifdef HAVE_DTRACE
	30	$(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d
	31	- dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
	32	+ dtrace -x nolibs -h -s $(srcdir)/devtools/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/spidermonkey24/files/patch-bug702179 (+23 lines)
	1	diff --git js/src/Makefile.in js/src/Makefile.in
	2	index e28160a..28ca5e8 100644
	3	--- Makefile.in
	4	+++ Makefile.in
	5	@@ -35,7 +35,6 @@ ifdef JS_SHARED_LIBRARY
	6	FORCE_SHARED_LIB = 1
	7	endif
	8	FORCE_STATIC_LIB = 1
	9	-DIST_INSTALL = 1
	10
	11	###############################################
	12	# BEGIN include sources for low-level code shared with mfbt
	13	@@ -584,8 +584,8 @@ install:: $(EXPORTS_mozilla)
	14	install:: $(SCRIPTS)
	15	$(SYSINSTALL) $^ $(DESTDIR)$(bindir)
	16
	17	-install:: $(REAL_LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
	18	-ifneq (,$(REAL_LIBRARY))
	19	+install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
	20	+ifdef DIST_INSTALL
	21	$(SYSINSTALL) $(REAL_LIBRARY) $(DESTDIR)$(libdir)
	22	mv -f $(DESTDIR)$(libdir)/$(REAL_LIBRARY) $(subst $(STATIC_LIBRARY_NAME),$(LIBRARY_NAME),$(DESTDIR)$(libdir)/$(REAL_LIBRARY))
	23	endif