| 1 |
commit: 61fe4f891af6a622ebb4a3754f07ac5a54f5c629 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 27 16:03:08 2017 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 27 16:03:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61fe4f89 |
| 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 |
|
| 16 |
www-client/firefox/firefox-45.7.0.ebuild | 7 +++---- |
| 17 |
www-client/firefox/firefox-51.0.ebuild | 2 +- |
| 18 |
2 files changed, 4 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/www-client/firefox/firefox-45.7.0.ebuild b/www-client/firefox/firefox-45.7.0.ebuild |
| 21 |
index 6c62d94..9ad87f2 100644 |
| 22 |
--- a/www-client/firefox/firefox-45.7.0.ebuild |
| 23 |
+++ b/www-client/firefox/firefox-45.7.0.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2016 Gentoo Foundation |
| 26 |
+# Copyright 1999-2017 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
# $Id$ |
| 29 |
|
| 30 |
@@ -220,6 +220,7 @@ src_configure() { |
| 31 |
fi |
| 32 |
|
| 33 |
# workaround for funky/broken upstream configure... |
| 34 |
+ SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 35 |
emake -f client.mk configure |
| 36 |
} |
| 37 |
|
| 38 |
@@ -245,11 +246,9 @@ src_compile() { |
| 39 |
shopt -u nullglob |
| 40 |
addpredict "${cards}" |
| 41 |
|
| 42 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
| 43 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 44 |
virtx emake -f client.mk profiledbuild || die "virtx emake failed" |
| 45 |
else |
| 46 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
| 47 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 48 |
emake -f client.mk realbuild |
| 49 |
fi |
| 50 |
@@ -289,7 +288,7 @@ src_install() { |
| 51 |
|| die |
| 52 |
done |
| 53 |
|
| 54 |
- MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
| 55 |
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 56 |
emake DESTDIR="${D}" install |
| 57 |
|
| 58 |
# Install language packs |
| 59 |
|
| 60 |
diff --git a/www-client/firefox/firefox-51.0.ebuild b/www-client/firefox/firefox-51.0.ebuild |
| 61 |
index 03a20ee..f1f2b1c 100644 |
| 62 |
--- a/www-client/firefox/firefox-51.0.ebuild |
| 63 |
+++ b/www-client/firefox/firefox-51.0.ebuild |
| 64 |
@@ -306,7 +306,7 @@ src_install() { |
| 65 |
|| die |
| 66 |
done |
| 67 |
|
| 68 |
- MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
| 69 |
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 70 |
emake DESTDIR="${D}" install |
| 71 |
|
| 72 |
# Install language packs |
Archives