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

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

commit:     5e1aabf0827dd635a853fe40a761f8d2efa3aff6
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 16:03:08 2017 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> 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 <anarchy <AT> 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