[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     dd6235ca62a5342f6e4e47e1d39bcc0fa23161c4
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 16:05:39 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 16:05:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=dd6235ca

move addpredict for pgo to pkg_setup()

---
 www-client/firefox/Manifest           |    2 +-
 www-client/firefox/firefox-9.0.ebuild |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index ccee73e..3654fea 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -84,4 +84,4 @@ DIST firefox-9.0-zh-CN.xpi 246728 RMD160 96aef0ad9287f41589f59246eba1d2445d18a0c
 DIST firefox-9.0-zh-TW.xpi 247498 RMD160 163fa9dde9caa2e209eff47a1bdfee6cfd807aaf SHA1 f6c14facb1556002fcfb414533c171c2b9e08582 SHA256 6b50bd60567a46fd7af62160271ab9e0d5a40666c6a812fb9adcd7bce474a936
 DIST firefox-9.0-zu.xpi 238395 RMD160 67afb3fd7bd9006830747a75b5175facf8615f86 SHA1 1b7c947e15d5fb2f75503e1cad9940283edc87d5 SHA256 aedf4ab70c7cf603210e4ece1c21faf0c031f7b488dddc074c3f00e9d9a2feb5
 DIST firefox-9.0.source.tar.bz2 74197197 RMD160 4631b103aa80ae2ae22b61453f4e02c89962f1c1 SHA1 f79324ec6205e4c23d51d8ab2e790de1b2541657 SHA256 9e876498da6c2eb2a49b57b461d5b969b11810f6af9eaa858d8e4cb514a9bd05
-EBUILD firefox-9.0.ebuild 9841 RMD160 19e3eb83c56845bb7973bb821b018b8d091b6259 SHA1 9556856bbe4e4307430df4ef37ff1c2843a2eafb SHA256 5816d6fe2877afee020e48a22b2fa26803fd2db0fb442b3780445748aeb98949
+EBUILD firefox-9.0.ebuild 9841 RMD160 04091e57405842c78293d8980d03fb67c1bcd3bb SHA1 71c51423ff2f1dac54a1df8e72d4c4639abe3481 SHA256 362d34b7bac2e220b82a9ac769eebc40d092d7a567d9f45d7584c3f22e1463ec

diff --git a/www-client/firefox/firefox-9.0.ebuild b/www-client/firefox/firefox-9.0.ebuild
index f379e30..f03ba57 100644
--- a/www-client/firefox/firefox-9.0.ebuild
+++ b/www-client/firefox/firefox-9.0.ebuild
@@ -106,6 +106,14 @@ pkg_setup() {
 		einfo
 		ewarn "You will do a double build for profile guided optimization."
 		ewarn "This will result in your build taking at least twice as long as before."
+
+		addpredict /root
+		addpredict /etc/gconf
+		# Firefox tries to dri stuff when it's run, see bug 380283
+		shopt -s nullglob
+		local cards=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g')
+		shopt -u nullglob
+		test -n "${cards}" && addpredict "${cards}"
 	fi
 
 	# Ensure we have enough disk space to compile
@@ -216,14 +224,6 @@ src_configure() {
 
 src_compile() {
 	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Firefox tries to dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		local cards=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g')
-		shopt -u nullglob
-		test -n "${cards}" && addpredict "${cards}"
-
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
 		Xemake -f client.mk profiledbuild || die "Xemake failed"