From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-833247-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 7D6011385E0
for <garchives@archives.gentoo.org>; Mon, 7 Sep 2015 20:23:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DF55A141E3;
Mon, 7 Sep 2015 20:23:55 +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 85197141E3
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Sep 2015 20:23:55 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BFC84340887
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Sep 2015 20:23:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E751B186
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Sep 2015 20:23:51 +0000 (UTC)
From: "Ian Stakenvicius" <axs@gentoo.org>
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" <axs@gentoo.org>
Message-ID: <1441656108.419cd66ae4db7e0d969d8843ffae485be51c20a4.axs@gentoo>
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/
X-VCS-Repository: proj/mozilla
X-VCS-Files: www-client/firefox/firefox-40.0.3.ebuild www-client/firefox/firefox-41.0_beta6.ebuild
X-VCS-Directories: www-client/firefox/
X-VCS-Committer: axs
X-VCS-Committer-Name: Ian Stakenvicius
X-VCS-Revision: 419cd66ae4db7e0d969d8843ffae485be51c20a4
X-VCS-Branch: master
Date: Mon, 7 Sep 2015 20:23:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d5576cbf-ecf1-432c-8472-43f4595ea1fb
X-Archives-Hash: 4d05c821395928f09d8a0b6ebb6418a7
commit: 419cd66ae4db7e0d969d8843ffae485be51c20a4
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 20:01:35 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 20:01:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=419cd66a
Ensure $SHELL gets set to something, fixes build crash for catalyst
www-client/firefox/firefox-40.0.3.ebuild | 4 ++--
www-client/firefox/firefox-41.0_beta6.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/www-client/firefox/firefox-40.0.3.ebuild b/www-client/firefox/firefox-40.0.3.ebuild
index a467abf..d9d99ac 100644
--- a/www-client/firefox/firefox-40.0.3.ebuild
+++ b/www-client/firefox/firefox-40.0.3.ebuild
@@ -281,11 +281,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-41.0_beta6.ebuild b/www-client/firefox/firefox-41.0_beta6.ebuild
index bdf7832..44b9404 100644
--- a/www-client/firefox/firefox-41.0_beta6.ebuild
+++ b/www-client/firefox/firefox-41.0_beta6.ebuild
@@ -281,11 +281,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