| 1 |
commit: 5e1aabf0827dd635a853fe40a761f8d2efa3aff6 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 27 16:03:08 2017 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 28 00:29:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=5e1aabf0 |
| 7 |
|
| 8 |
www-client/firefox: adjust SHELL, other var specs on calls to emake |
| 9 |
|
| 10 |
Aligned the use of forcing various variables on calls to emake, so that they |
| 11 |
are common across all current versions of firefox. This should address |
| 12 |
two bugs related to SHELL: bug 602370 and bug 600488 |
| 13 |
|
| 14 |
Package-Manager: portage-2.3.0 |
| 15 |
Signed-off-by: Jory A. Pratt <anarchy <AT> gentoo.org> |
| 16 |
|
| 17 |
www-client/firefox/firefox-45.7.0.ebuild | 7 +++---- |
| 18 |
www-client/firefox/firefox-52.0_beta1.ebuild | 2 +- |
| 19 |
2 files changed, 4 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/www-client/firefox/firefox-45.7.0.ebuild b/www-client/firefox/firefox-45.7.0.ebuild |
| 22 |
index acac8f4..34f9e6c 100644 |
| 23 |
--- a/www-client/firefox/firefox-45.7.0.ebuild |
| 24 |
+++ b/www-client/firefox/firefox-45.7.0.ebuild |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-# Copyright 1999-2016 Gentoo Foundation |
| 27 |
+# Copyright 1999-2017 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
# $Id$ |
| 30 |
|
| 31 |
@@ -223,6 +223,7 @@ src_configure() { |
| 32 |
fi |
| 33 |
|
| 34 |
# workaround for funky/broken upstream configure... |
| 35 |
+ SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 36 |
emake -f client.mk configure |
| 37 |
} |
| 38 |
|
| 39 |
@@ -248,11 +249,9 @@ src_compile() { |
| 40 |
shopt -u nullglob |
| 41 |
addpredict "${cards}" |
| 42 |
|
| 43 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
| 44 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 45 |
virtx emake -f client.mk profiledbuild || die "virtx emake failed" |
| 46 |
else |
| 47 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
| 48 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 49 |
emake -f client.mk realbuild |
| 50 |
fi |
| 51 |
@@ -292,7 +291,7 @@ src_install() { |
| 52 |
|| die |
| 53 |
done |
| 54 |
|
| 55 |
- MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
| 56 |
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 57 |
emake DESTDIR="${D}" install |
| 58 |
|
| 59 |
# Install language packs |
| 60 |
|
| 61 |
diff --git a/www-client/firefox/firefox-52.0_beta1.ebuild b/www-client/firefox/firefox-52.0_beta1.ebuild |
| 62 |
index a3358b9..a3ef82e 100644 |
| 63 |
--- a/www-client/firefox/firefox-52.0_beta1.ebuild |
| 64 |
+++ b/www-client/firefox/firefox-52.0_beta1.ebuild |
| 65 |
@@ -306,7 +306,7 @@ src_install() { |
| 66 |
|| die |
| 67 |
done |
| 68 |
|
| 69 |
- MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
| 70 |
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 71 |
emake DESTDIR="${D}" install |
| 72 |
|
| 73 |
# Install language packs |
Archives