mirror of
https://git.freebsd.org/ports.git
synced 2025-07-13 15:29:15 -04:00
f92079c61e
- firefox 31.0 - firefox-esr 24.7.0 - libxul 24.7.0 - seamonkey 2.26.1 - thunderbird 31.0 Among changes: - add workaround for crash with openldap on thunderbird and seamonkey [1] - add crashfix for architectures with strict alignmentment - backport crashfix with system sqlite/nss on firefox-esr and thunderbird - restore hooking jemalloc in sqlite on freebsd 10+ - fix thunderbird build with -jN [2] - respect MAKE_JOBS_NUMBER regardless of kern.smp.cpus [2] - define CPE_URI for nspr/nss and firefox/thunderbird/seamonkey - require recent gstreamer1-libav i386 crashfix - add DTRACE option for use with DTraceToolkit (js_flowtime.d, js_who.d, etc) PR: 165263 [1] PR: 184630 [2] Submitted by: Jan Beich
48 lines
2.2 KiB
Text
48 lines
2.2 KiB
Text
diff --git config/rules.mk 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
|
|
--- js/src/Makefile.in
|
|
+++ js/src/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 probes/Makefile.in probes/Makefile.in
|
|
index 6d18f34..deec83f 100644
|
|
--- probes/Makefile.in
|
|
+++ probes/Makefile.in
|
|
@@ -7,7 +7,7 @@ export:: $(DIST)/include/mozilla-trace.h
|
|
|
|
# Replace _DTRACE_VERSION with INCLUDE_MOZILLA_DTRACE
|
|
$(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile
|
|
- dtrace -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
|
|
+ dtrace -x nolibs -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
|
|
sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
|
|
mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h
|
|
rm mozilla-trace.h.tmp
|