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

diff --git a/mail-client/thunderbird/thunderbird-38.2.0.ebuild b/mail-client/thunderbird/thunderbird-38.2.0.ebuild
index f7f9b9e6f6752bcb04bd312acb8d8cbb414cabc8..c7a4cf98c7a7c5f1daf9dfa47b4ec28916c85061 100644 (file)
--- 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 fde4d4e24d53b80008f3fc60b95f64177cf34432..2c1fe1f145d95ce27cf164a39ffab13f98f5a9ab 100644 (file)
--- 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 89f66579cbca9c4043873caf73fa6a7eedb976e6..c71527a45f40f4210ca27aec17188993acac669f 100644 (file)
--- 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