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

[Ian Stakenvicius]

commit:     419cd66ae4db7e0d969d8843ffae485be51c20a4
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 20:01:35 2015 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 20:01:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=419cd66a

Ensure $SHELL gets set to something, fixes build crash for catalyst

 www-client/firefox/firefox-40.0.3.ebuild     | 4 ++--
 www-client/firefox/firefox-41.0_beta6.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-client/firefox/firefox-40.0.3.ebuild 
b/www-client/firefox/firefox-40.0.3.ebuild
index a467abf..d9d99ac 100644
--- a/www-client/firefox/firefox-40.0.3.ebuild
+++ b/www-client/firefox/firefox-40.0.3.ebuild
@@ -281,11 +281,11 @@ src_compile() {
                addpredict "${cards}"
 
                CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-               MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+               MOZ_MAKE_FLAGS="${MAKEOPTS}" 
SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
                Xemake -f client.mk profiledbuild || die "Xemake failed"
        else
                CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-               MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+               MOZ_MAKE_FLAGS="${MAKEOPTS}" 
SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
                emake -f client.mk realbuild
        fi
 

diff --git a/www-client/firefox/firefox-41.0_beta6.ebuild 
b/www-client/firefox/firefox-41.0_beta6.ebuild
index bdf7832..44b9404 100644
--- a/www-client/firefox/firefox-41.0_beta6.ebuild
+++ b/www-client/firefox/firefox-41.0_beta6.ebuild
@@ -281,11 +281,11 @@ src_compile() {
                addpredict "${cards}"
 
                CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-               MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+               MOZ_MAKE_FLAGS="${MAKEOPTS}" 
SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
                Xemake -f client.mk profiledbuild || die "Xemake failed"
        else
                CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-               MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+               MOZ_MAKE_FLAGS="${MAKEOPTS}" 
SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
                emake -f client.mk realbuild
        fi