From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8CC42138334 for ; Sat, 17 Nov 2018 16:52:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A23FE0B34; Sat, 17 Nov 2018 16:52:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C3ADE0B34 for ; Sat, 17 Nov 2018 16:52:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 39126335C38 for ; Sat, 17 Nov 2018 16:52:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA184455 for ; Sat, 17 Nov 2018 16:52:33 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1542473489.5457e2f4fb34e39402ce387a67788022ef53d414.axs@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild X-VCS-Directories: dev-lang/spidermonkey/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: 5457e2f4fb34e39402ce387a67788022ef53d414 X-VCS-Branch: master Date: Sat, 17 Nov 2018 16:52:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b9b7ca49-8bd0-4521-b77d-39ecc21c4c17 X-Archives-Hash: f22e3e5c09dc87a89c39ebb7ee7a9c8b commit: 5457e2f4fb34e39402ce387a67788022ef53d414 Author: Ian Stakenvicius gentoo org> AuthorDate: Sat Nov 17 15:57:20 2018 +0000 Commit: Ian Stakenvicius gentoo 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 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