From owner-freebsd-gecko@FreeBSD.ORG Mon Aug 5 15:41:27 2013 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 ESMTP id 4C53B9F3 for ; Mon, 5 Aug 2013 15:41:27 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E283E23E7 for ; Mon, 5 Aug 2013 15:41:26 +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 r75FfPcP027071 for ; Mon, 5 Aug 2013 15:41:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r75FfKOe025955 for freebsd-gecko@freebsd.org; Mon, 5 Aug 2013 15:41:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 5 Aug 2013 15:41:20 GMT Message-Id: <201308051541.r75FfKOe025955@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] r1301 - in trunk: Mk www/firefox www/firefox-esr www/firefox-nightly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Aug 2013 15:41:27 -0000 Author: jbeich Date: Mon Aug 5 15:41:19 2013 New Revision: 1301 Log: move PGO option to bsd.gecko.mk now that python is required Modified: trunk/Mk/bsd.gecko.mk trunk/www/firefox-esr/Makefile trunk/www/firefox-nightly/Makefile trunk/www/firefox/Makefile trunk/www/firefox/Makefile.options Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Mon Aug 5 15:31:06 2013 (r1300) +++ trunk/Mk/bsd.gecko.mk Mon Aug 5 15:41:19 2013 (r1301) @@ -756,6 +756,17 @@ MOZ_OPTIONS+= --disable-libproxy .endif +.if ${PORT_OPTIONS:MPGO} +USE_GCC?= yes +USE_DISPLAY=yes + +.undef GNU_CONFIGURE +MAKEFILE= ${WRKSRC}/client.mk +ALL_TARGET= profiledbuild +MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \ + @MOZ_OBJDIR@/_profile/pgo/profileserver.py" +.endif + .if ${PORT_OPTIONS:MWEBRTC} BUILD_DEPENDS+= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS+= v4l2:${PORTSDIR}/multimedia/libv4l @@ -845,6 +856,22 @@ .else # bsd.port.post.mk +pre-extract: gecko-pre-extract + +gecko-pre-extract: +.if ${PORT_OPTIONS:MPGO} + @${ECHO} "*****************************************************************" + @${ECHO} "**************************** attention **************************" + @${ECHO} "*****************************************************************" + @${ECHO} "To build ${MOZILLA} with PGO support you need a running X server and" + @${ECHO} " build this port with an user who could access the X server! " + @${ECHO} "" + @${ECHO} "During the build a ${MOZILLA} instance will start and run some test." + @${ECHO} " Do not interrupt or close ${MOZILLA} during this tests! " + @${ECHO} "*****************************************************************" + @sleep 10 +.endif + post-patch: gecko-post-patch gecko-moz-pis-patch gecko-post-patch: Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Mon Aug 5 15:31:06 2013 (r1300) +++ trunk/www/firefox-esr/Makefile Mon Aug 5 15:41:19 2013 (r1301) @@ -46,39 +46,11 @@ --enable-application=browser \ --enable-official-branding -OPTIONS_DEFINE= PGO - .include "${.CURDIR}/../../www/firefox/Makefile.options" .include WRKSRC:= ${WRKDIR}/mozilla-esr17 -.if ${PORT_OPTIONS:MPGO} -USE_GCC?= any -USE_DISPLAY= yes -.include "${PORTSDIR}/Mk/bsd.python.mk" - -.undef GNU_CONFIGURE -MAKEFILE= ${WRKSRC}/client.mk -ALL_TARGET= profiledbuild -MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \ - @MOZ_OBJDIR@/_profile/pgo/profileserver.py" -.endif - -pre-extract: -.if ${PORT_OPTIONS:MPGO} - @${ECHO} "*****************************************************************" - @${ECHO} "**************************** attention **************************" - @${ECHO} "*****************************************************************" - @${ECHO} "To build Firefox with PGO support you need a running X server and" - @${ECHO} " build this port with an user who could access the X server! " - @${ECHO} "" - @${ECHO} "During the build a Firefox instance will start and run some test." - @${ECHO} " Do not interrupt or close Firefox during this tests! " - @${ECHO} "*****************************************************************" - @sleep 10 -.endif - post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Mon Aug 5 15:31:06 2013 (r1300) +++ trunk/www/firefox-nightly/Makefile Mon Aug 5 15:41:19 2013 (r1301) @@ -48,7 +48,7 @@ MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ --enable-application=browser -OPTIONS_DEFINE= PGO WEBRTC +OPTIONS_DEFINE= WEBRTC OPTIONS_DEFAULT=GSTREAMER GTK2 WEBRTC OPTIONS_SINGLE+= TOOLKIT @@ -63,31 +63,6 @@ WRKSRC:= ${WRKSRC}-central-${HGREV:C/.*://} -.if ${PORT_OPTIONS:MPGO} -USE_GCC?= yes -USE_DISPLAY= yes - -.undef GNU_CONFIGURE -MAKEFILE= ${WRKSRC}/client.mk -ALL_TARGET= profiledbuild -MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \ - @MOZ_OBJDIR@/_profile/pgo/profileserver.py" -.endif - -pre-extract: -.if ${PORT_OPTIONS:MPGO} - @${ECHO} "*****************************************************************" - @${ECHO} "**************************** attention **************************" - @${ECHO} "*****************************************************************" - @${ECHO} "To build Firefox with PGO support you need a running X server and" - @${ECHO} " build this port with an user who could access the X server! " - @${ECHO} "" - @${ECHO} "During the build a Firefox instance will start and run some test." - @${ECHO} " Do not interrupt or close Firefox during this tests! " - @${ECHO} "*****************************************************************" - @sleep 10 -.endif - post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Mon Aug 5 15:31:06 2013 (r1300) +++ trunk/www/firefox/Makefile Mon Aug 5 15:41:19 2013 (r1301) @@ -46,7 +46,7 @@ --enable-application=browser \ --enable-official-branding -OPTIONS_DEFINE= PGO WEBRTC +OPTIONS_DEFINE= WEBRTC OPTIONS_DEFAULT=WEBRTC .include "${.CURDIR}/../../www/firefox/Makefile.options" @@ -58,32 +58,6 @@ WRKSRC:= ${WRKDIR}/mozilla-release -.if ${PORT_OPTIONS:MPGO} -USE_GCC?= yes -USE_DISPLAY= yes -.include "${PORTSDIR}/Mk/bsd.python.mk" - -.undef GNU_CONFIGURE -MAKEFILE= ${WRKSRC}/client.mk -ALL_TARGET= profiledbuild -MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \ - @MOZ_OBJDIR@/_profile/pgo/profileserver.py" -.endif - -pre-extract: -.if ${PORT_OPTIONS:MPGO} - @${ECHO} "*****************************************************************" - @${ECHO} "**************************** attention **************************" - @${ECHO} "*****************************************************************" - @${ECHO} "To build Firefox with PGO support you need a running X server and" - @${ECHO} " build this port with an user who could access the X server! " - @${ECHO} "" - @${ECHO} "During the build a Firefox instance will start and run some test." - @${ECHO} " Do not interrupt or close Firefox during this tests! " - @${ECHO} "*****************************************************************" - @sleep 10 -.endif - post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ Modified: trunk/www/firefox/Makefile.options ============================================================================== --- trunk/www/firefox/Makefile.options Mon Aug 5 15:31:06 2013 (r1300) +++ trunk/www/firefox/Makefile.options Mon Aug 5 15:41:19 2013 (r1301) @@ -1,7 +1,7 @@ # -*- makefile-bsdmake -*- OPTIONS_DEFINE+= DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 GSTREAMER \ - LIBPROXY LOGGING OPTIMIZED_CFLAGS + LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO OPTIONS_DEFAULT+= ALSA DBUS GIO LOGGING OPTIONS_SINGLE+= AUDIO