From 61fe4f891af6a622ebb4a3754f07ac5a54f5c629 Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Fri, 27 Jan 2017 11:03:08 -0500 Subject: 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 --- www-client/firefox/firefox-45.7.0.ebuild | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'www-client/firefox/firefox-45.7.0.ebuild') diff --git a/www-client/firefox/firefox-45.7.0.ebuild b/www-client/firefox/firefox-45.7.0.ebuild index 6c62d9490f9..9ad87f2c105 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$ @@ -220,6 +220,7 @@ src_configure() { fi # workaround for funky/broken upstream configure... + SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ emake -f client.mk configure } @@ -245,11 +246,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 @@ -289,7 +288,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 -- cgit v1.2.3-18-g5258