[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/, www-client/firefox/

[Ian Stakenvicius]

commit:     1602509da7c0b88c9a22ef15bde49c91566eaa8e
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 20:29:40 2015 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 20:31:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1602509d

firefox,thunderbird: Ensure $SHELL gets set to something

Zero_Chaos noticed when building firefox within catalyst that failures would
occur due to the build system not finding the correct shell.  It was determined
this was due to catalyst not setting SHELL in the environment, which resulted in
the firefox build system being passed SHELL="" and causing the failure.

This commit ensures SHELL will never be empty by hard-coding /bin/bash 
(EPREFIX'd
when appropriate) if there is no SHELL specified in the environment.

Changed ebuilds:
www-client/firefox-38.2.1
www-client/firefox-40.0.3
mail-client/thunderbird-38.2.0

Package-Manager: portage-2.2.20.1

 mail-client/thunderbird/thunderbird-38.2.0.ebuild | 2 +-
 www-client/firefox/firefox-38.2.1.ebuild          | 4 ++--
 www-client/firefox/firefox-40.0.3.ebuild          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mail-client/thunderbird/thunderbird-38.2.0.ebuild 
b/mail-client/thunderbird/thunderbird-38.2.0.ebuild
index f7f9b9e..c7a4cf9 100644
--- a/mail-client/thunderbird/thunderbird-38.2.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.2.0.ebuild
@@ -244,7 +244,7 @@ src_compile() {
        mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
 
        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 "${S}"/client.mk
 
        # Only build enigmail extension if crypt enabled.

diff --git a/www-client/firefox/firefox-38.2.1.ebuild 
b/www-client/firefox/firefox-38.2.1.ebuild
index fde4d4e..2c1fe1f 100644
--- a/www-client/firefox/firefox-38.2.1.ebuild
+++ b/www-client/firefox/firefox-38.2.1.ebuild
@@ -275,11 +275,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-40.0.3.ebuild 
b/www-client/firefox/firefox-40.0.3.ebuild
index 89f6657..c71527a 100644
--- a/www-client/firefox/firefox-40.0.3.ebuild
+++ b/www-client/firefox/firefox-40.0.3.ebuild
@@ -277,11 +277,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