[gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/

[Ian Stakenvicius]

commit:     5457e2f4fb34e39402ce387a67788022ef53d414
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 15:57:20 2018 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 16:51:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5457e2f4

dev-lang/spidermonkey: fix SHELL every way possible

The changes in this commit are overkill, but with v60 built using mach
there isn't any form of precedent to set with this code, and ensuring
these assignments occur will squash this bug once and for all no matter
how it manifests.

Bug: https://bugs.gentoo.org/666732
Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
index 990f45f27fe..cadf22413d7 100644
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
@@ -34,6 +34,8 @@ DEPEND="${RDEPEND}"
 pkg_setup(){
 	[[ ${MERGE_TYPE} == "binary" ]] || \
 		moz_pkgsetup
+
+	export SHELL="${EPREFIX}/bin/bash"
 }
 
 src_prepare() {
@@ -91,6 +93,7 @@ cross_make() {
 		CC="${BUILD_CC}" \
 		CXX="${BUILD_CXX}" \
 		RANLIB="${BUILD_RANLIB}" \
+		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 		"$@"
 }
 src_compile() {
@@ -120,6 +123,7 @@ src_compile() {
 	fi
 
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake \
 		MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \
 		HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \
@@ -133,6 +137,7 @@ src_test() {
 
 src_install() {
 	cd "${BUILDDIR}" || die
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake DESTDIR="${D}" install
 
 	if ! use minimal; then