From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 09EC61385E0 for ; Mon, 7 Sep 2015 20:32:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4820E14268; Mon, 7 Sep 2015 20:32:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C9F5D14268 for ; Mon, 7 Sep 2015 20:32:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 656C934082B for ; Mon, 7 Sep 2015 20:32:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98C2E170 for ; Mon, 7 Sep 2015 20:32:28 +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: <1441657918.1602509da7c0b88c9a22ef15bde49c91566eaa8e.axs@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/, www-client/firefox/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/thunderbird/thunderbird-38.2.0.ebuild www-client/firefox/firefox-38.2.1.ebuild www-client/firefox/firefox-40.0.3.ebuild X-VCS-Directories: www-client/firefox/ mail-client/thunderbird/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: 1602509da7c0b88c9a22ef15bde49c91566eaa8e X-VCS-Branch: master Date: Mon, 7 Sep 2015 20:32:28 +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: 64d92ad9-da5f-47e2-8d0d-f1e7bb29cd8c X-Archives-Hash: a823bfeba0df02d32d3bfc3817f9dcec commit: 1602509da7c0b88c9a22ef15bde49c91566eaa8e Author: Ian Stakenvicius gentoo org> AuthorDate: Mon Sep 7 20:29:40 2015 +0000 Commit: Ian Stakenvicius gentoo 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