[SVN-Commit] r1631 - in trunk: . Mk www/firefox www/firefox-nightly/files www/firefox/files www/seamonkey/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Mon Jul 21 04:18:35 2014
New Revision: 1631

Log:
add DTRACE option

Added:
   trunk/www/firefox-nightly/files/patch-bug1041381
   trunk/www/firefox/files/patch-bug1041381
   trunk/www/seamonkey/files/patch-bug1041381
Modified:
   trunk/Gecko_ChangeLog
   trunk/Mk/bsd.gecko.mk
   trunk/www/firefox/Makefile.options

Modified: trunk/Gecko_ChangeLog
==============================================================================
--- trunk/Gecko_ChangeLog	Sun Jul 20 01:27:41 2014	(r1630)
+++ trunk/Gecko_ChangeLog	Mon Jul 21 04:18:35 2014	(r1631)
@@ -6,6 +6,7 @@
 - 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
 
 PR:	ports/165263 [1]
 PR:	ports/184630 [2]

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Sun Jul 20 01:27:41 2014	(r1630)
+++ trunk/Mk/bsd.gecko.mk	Mon Jul 21 04:18:35 2014	(r1631)
@@ -395,6 +395,13 @@
 MOZ_OPTIONS+=	--disable-debug --enable-release
 .endif
 
+.if ${PORT_OPTIONS:MDTRACE}
+MOZ_OPTIONS+=	--enable-dtrace
+LIBS+=			-lelf
+.else
+MOZ_OPTIONS+=	--disable-dtrace
+.endif
+
 .if ${PORT_OPTIONS:MLOGGING} || ${PORT_OPTIONS:MDEBUG}
 MOZ_OPTIONS+=	--enable-logging
 .else
@@ -489,6 +496,12 @@
 pre-extract: gecko-pre-extract
 
 gecko-pre-extract:
+.if ${PORT_OPTIONS:MDTRACE}
+	@if ! kldstat -qm sdt; then \
+		${ECHO_MSG} DTRACE requires sdt.ko loaded in kernel to build; \
+		exit 1; \
+	fi
+.endif
 .if ${PORT_OPTIONS:MPGO}
 	@${ECHO} "*****************************************************************"
 	@${ECHO} "**************************** attention **************************"

Added: trunk/www/firefox-nightly/files/patch-bug1041381
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug1041381	Mon Jul 21 04:18:35 2014	(r1631)
@@ -0,0 +1,12 @@
+diff --git config/rules.mk config/rules.mk
+index 1dee8c3..4d67eda 100644
+--- config/rules.mk
++++ config/rules.mk
+@@ -822,6 +822,7 @@ endif
+ ifdef DTRACE_PROBE_OBJ
+ EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
+ OBJS += $(DTRACE_PROBE_OBJ)
++EXCLUDED_OBJS += $(DTRACE_PROBE_OBJ)
+ endif
+ 
+ $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)

Modified: trunk/www/firefox/Makefile.options
==============================================================================
--- trunk/www/firefox/Makefile.options	Sun Jul 20 01:27:41 2014	(r1630)
+++ trunk/www/firefox/Makefile.options	Mon Jul 21 04:18:35 2014	(r1631)
@@ -1,12 +1,13 @@
 # -*- makefile-bsdmake -*-
 
-OPTIONS_DEFINE+=	DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 GSTREAMER \
+OPTIONS_DEFINE+=	DBUS DEBUG DTRACE GCONF GIO GNOMEUI GNOMEVFS2 GSTREAMER \
 			LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO PROFILE TEST
 OPTIONS_DEFAULT+=	ALSA DBUS GIO GSTREAMER LOGGING OPTIMIZED_CFLAGS
 
 OPTIONS_MULTI+=		AUDIO
 OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
 
+DTRACE_DESC?=		Build with DTrace probes # move to bsd.options.desc.mk
 ENIGMAIL_DESC?=		Enigmail extension
 GIO_DESC?=		GIO for file I/O # move to bsd.options.desc.mk
 GNOMEUI_DESC?=		libgnomeui support module

Added: trunk/www/firefox/files/patch-bug1041381
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug1041381	Mon Jul 21 04:18:35 2014	(r1631)
@@ -0,0 +1,12 @@
+diff --git config/rules.mk config/rules.mk
+index 1dee8c3..4d67eda 100644
+--- config/rules.mk
++++ config/rules.mk
+@@ -822,6 +822,7 @@ endif
+ ifdef DTRACE_PROBE_OBJ
+ EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
+ OBJS += $(DTRACE_PROBE_OBJ)
++EXCLUDED_OBJS += $(DTRACE_PROBE_OBJ)
+ endif
+ 
+ $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)

Added: trunk/www/seamonkey/files/patch-bug1041381
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug1041381	Mon Jul 21 04:18:35 2014	(r1631)
@@ -0,0 +1,12 @@
+diff --git config/rules.mk config/rules.mk
+index 1dee8c3..4d67eda 100644
+--- mozilla/config/rules.mk
++++ mozilla/config/rules.mk
+@@ -822,6 +822,7 @@ endif
+ ifdef DTRACE_PROBE_OBJ
+ EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
+ OBJS += $(DTRACE_PROBE_OBJ)
++EXCLUDED_OBJS += $(DTRACE_PROBE_OBJ)
+ endif
+ 
+ $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)