From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 26B981381F3 for ; Wed, 19 Jun 2013 13:22:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B48EEE08DC; Wed, 19 Jun 2013 13:22:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45F8AE08DC for ; Wed, 19 Jun 2013 13:22:19 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5FF0733E481 for ; Wed, 19 Jun 2013 13:22:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 07E2CE468F for ; Wed, 19 Jun 2013 13:22:17 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1371648094.46f72a58b0d77c10543c5e51b9182c0bc56fa53e.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/firefox-22.0_beta6.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 46f72a58b0d77c10543c5e51b9182c0bc56fa53e X-VCS-Branch: master Date: Wed, 19 Jun 2013 13:22:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ad239b5d-0808-4f6e-b466-a29a8875dcd3 X-Archives-Hash: 4dba761f24bd88df6832493735512314 commit: 46f72a58b0d77c10543c5e51b9182c0bc56fa53e Author: Jory A. Pratt gentoo org> AuthorDate: Wed Jun 19 13:21:34 2013 +0000 Commit: Jory Pratt gentoo org> CommitDate: Wed Jun 19 13:21:34 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=46f72a58 Fix pgo sandbox violation, bug #471358 --- www-client/firefox/firefox-22.0_beta6.ebuild | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/www-client/firefox/firefox-22.0_beta6.ebuild b/www-client/firefox/firefox-22.0_beta6.ebuild index f5f8446..b3c173a 100644 --- a/www-client/firefox/firefox-22.0_beta6.ebuild +++ b/www-client/firefox/firefox-22.0_beta6.ebuild @@ -259,10 +259,7 @@ src_compile() { # Firefox tries to use dri stuff when it's run, see bug 380283 shopt -s nullglob cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${cards}"; then - # FOSS drivers are fine - addpredict "${cards}" - else + if test -z "${cards}"; then cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g') if test -n "${cards}"; then # Binary drivers seem to cause access violations anyway, so @@ -272,6 +269,7 @@ src_compile() { fi fi shopt -u nullglob + addpredict "${cards}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \