From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 21 04:18:48 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D071D87E for ; Mon, 21 Jul 2014 04:18:48 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75A412096 for ; Mon, 21 Jul 2014 04:18:48 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s6L4Iexa008385 for ; Mon, 21 Jul 2014 04:18:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s6L4IZ9w006757 for freebsd-gecko@freebsd.org; Mon, 21 Jul 2014 04:18:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 21 Jul 2014 04:18:35 GMT Message-Id: <201407210418.s6L4IZ9w006757@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1631 - in trunk: . Mk www/firefox www/firefox-nightly/files www/firefox/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jul 2014 04:18:48 -0000 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)