From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 86DE5139085 for ; Sat, 28 Jan 2017 00:31:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D8A2E0DA9; Sat, 28 Jan 2017 00:31:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E92BEE0DA9 for ; Sat, 28 Jan 2017 00:31:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90166341663 for ; Sat, 28 Jan 2017 00:31:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BECBB3238 for ; Sat, 28 Jan 2017 00:31:38 +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: <1485563368.5e1aabf0827dd635a853fe40a761f8d2efa3aff6.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-45.7.0.ebuild www-client/firefox/firefox-52.0_beta1.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 5e1aabf0827dd635a853fe40a761f8d2efa3aff6 X-VCS-Branch: master Date: Sat, 28 Jan 2017 00:31:38 +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: a9fa8dad-beed-419d-ab20-01f4b7487c05 X-Archives-Hash: db2d70bbefcee6f9e8b84ce0e50838ef commit: 5e1aabf0827dd635a853fe40a761f8d2efa3aff6 Author: Ian Stakenvicius gentoo org> AuthorDate: Fri Jan 27 16:03:08 2017 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sat Jan 28 00:29:28 2017 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=5e1aabf0 www-client/firefox: adjust SHELL, other var specs on calls to emake Aligned the use of forcing various variables on calls to emake, so that they are common across all current versions of firefox. This should address two bugs related to SHELL: bug 602370 and bug 600488 Package-Manager: portage-2.3.0 Signed-off-by: Jory A. Pratt gentoo.org> www-client/firefox/firefox-45.7.0.ebuild | 7 +++---- www-client/firefox/firefox-52.0_beta1.ebuild | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/www-client/firefox/firefox-45.7.0.ebuild b/www-client/firefox/firefox-45.7.0.ebuild index acac8f4..34f9e6c 100644 --- a/www-client/firefox/firefox-45.7.0.ebuild +++ b/www-client/firefox/firefox-45.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -223,6 +223,7 @@ src_configure() { fi # workaround for funky/broken upstream configure... + SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ emake -f client.mk configure } @@ -248,11 +249,9 @@ src_compile() { shopt -u nullglob addpredict "${cards}" - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ virtx emake -f client.mk profiledbuild || die "virtx emake failed" else - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ emake -f client.mk realbuild fi @@ -292,7 +291,7 @@ src_install() { || die done - MOZ_MAKE_FLAGS="${MAKEOPTS}" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ emake DESTDIR="${D}" install # Install language packs diff --git a/www-client/firefox/firefox-52.0_beta1.ebuild b/www-client/firefox/firefox-52.0_beta1.ebuild index a3358b9..a3ef82e 100644 --- a/www-client/firefox/firefox-52.0_beta1.ebuild +++ b/www-client/firefox/firefox-52.0_beta1.ebuild @@ -306,7 +306,7 @@ src_install() { || die done - MOZ_MAKE_FLAGS="${MAKEOPTS}" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ emake DESTDIR="${D}" install # Install language packs