Date: Tue, 26 Jun 2012 06:06:11 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r808 - in branches/experimental/www: firefox firefox-esr firefox-nightly Message-ID: <201206260606.q5Q66Bph023169@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Jun 26 06:06:11 2012
New Revision: 808
Log:
unbreak PGO after r781, r792
Modified:
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox/Makefile
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Tue Jun 26 06:05:31 2012 (r807)
+++ branches/experimental/www/firefox-esr/Makefile Tue Jun 26 06:06:11 2012 (r808)
@@ -84,7 +84,7 @@
USE_DISPLAY= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
-MAKEFILE= client.mk
+MAKEFILE= ${WRKSRC}/client.mk
ALL_TARGET= profiledbuild
.endif
@@ -148,7 +148,7 @@
@${SED} -e 's|@PYTHON@|${PYTHON_CMD}|' \
<${FILESDIR}/mozconfig-profile_guided_optimization.in \
>> ${BUILD_WRKSRC}/.mozconfig
- (cd ${WRKSRC} && ${GMAKE} distclean)
+ (cd ${BUILD_WRKSRC} && ${GMAKE} distclean)
.endif
port-pre-install:
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Tue Jun 26 06:05:31 2012 (r807)
+++ branches/experimental/www/firefox-nightly/Makefile Tue Jun 26 06:06:11 2012 (r808)
@@ -74,6 +74,7 @@
.if ${OSVERSION} > 1000011
MOZ_OPTIONS+= --enable-jemalloc
CONFIGURE_ENV+= MOZ_JEMALLOC=1
+MAKE_ENV+= MOZ_JEMALLOC=1 # PGO configure
.endif
.if ${ARCH} == powerpc64
@@ -96,7 +97,7 @@
USE_DISPLAY= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
-MAKEFILE= client.mk
+MAKEFILE= ${WRKSRC}/client.mk
ALL_TARGET= profiledbuild
.endif
@@ -156,7 +157,7 @@
@${SED} -e 's|@PYTHON@|${PYTHON_CMD}|' \
<${FILESDIR}/mozconfig-profile_guided_optimization.in \
>> ${BUILD_WRKSRC}/.mozconfig
- (cd ${WRKSRC} && ${GMAKE} distclean)
+ (cd ${BUILD_WRKSRC} && ${GMAKE} distclean)
.endif
port-pre-install:
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Tue Jun 26 06:05:31 2012 (r807)
+++ branches/experimental/www/firefox/Makefile Tue Jun 26 06:06:11 2012 (r808)
@@ -88,7 +88,7 @@
USE_DISPLAY= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
-MAKEFILE= client.mk
+MAKEFILE= ${WRKSRC}/client.mk
ALL_TARGET= profiledbuild
.endif
@@ -148,7 +148,7 @@
@${SED} -e 's|@PYTHON@|${PYTHON_CMD}|' \
<${FILESDIR}/mozconfig-profile_guided_optimization.in \
>> ${BUILD_WRKSRC}/.mozconfig
- (cd ${WRKSRC} && ${GMAKE} distclean)
+ (cd ${BUILD_WRKSRC} && ${GMAKE} distclean)
.endif
port-pre-install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206260606.q5Q66Bph023169>