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 <bsd.port.pre.mk>
 
 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
_______________________________________________
freebsd-gecko@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"

Reply via email to