| 1 |
commit: b2f6f16c80ac7398451a063e0b8460d144e2be5a |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 30 12:45:28 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 30 12:45:40 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f6f16c |
| 7 |
|
| 8 |
www-client/firefox: set correct update channel |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
www-client/firefox/firefox-78.3.0.ebuild | 6 +++++- |
| 14 |
www-client/firefox/firefox-81.0.ebuild | 6 +++++- |
| 15 |
2 files changed, 10 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/firefox/firefox-78.3.0.ebuild b/www-client/firefox/firefox-78.3.0.ebuild |
| 18 |
index 3012edf2a95..a1d5ff8af43 100644 |
| 19 |
--- a/www-client/firefox/firefox-78.3.0.ebuild |
| 20 |
+++ b/www-client/firefox/firefox-78.3.0.ebuild |
| 21 |
@@ -601,7 +601,6 @@ src_configure() { |
| 22 |
--libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 23 |
--prefix="${EPREFIX}/usr" \ |
| 24 |
--target="${CHOST}" \ |
| 25 |
- --update-channel=release \ |
| 26 |
--without-ccache \ |
| 27 |
--with-intl-api \ |
| 28 |
--with-libclang-path="$(llvm-config --libdir)" \ |
| 29 |
@@ -614,6 +613,11 @@ src_configure() { |
| 30 |
--x-includes="${SYSROOT}${EPREFIX}/usr/include" \ |
| 31 |
--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)" |
| 32 |
|
| 33 |
+ # Set update channel |
| 34 |
+ local update_channel=release |
| 35 |
+ [[ ${MOZ_ESR} == 1 ]] && update_channel=esr |
| 36 |
+ mozconfig_add_options_ac '' --update-channel=${update_channel} |
| 37 |
+ |
| 38 |
if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then |
| 39 |
mozconfig_add_options_ac '' --enable-rust-simd |
| 40 |
fi |
| 41 |
|
| 42 |
diff --git a/www-client/firefox/firefox-81.0.ebuild b/www-client/firefox/firefox-81.0.ebuild |
| 43 |
index f298f7c35b2..c92df895d0b 100644 |
| 44 |
--- a/www-client/firefox/firefox-81.0.ebuild |
| 45 |
+++ b/www-client/firefox/firefox-81.0.ebuild |
| 46 |
@@ -601,7 +601,6 @@ src_configure() { |
| 47 |
--libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 48 |
--prefix="${EPREFIX}/usr" \ |
| 49 |
--target="${CHOST}" \ |
| 50 |
- --update-channel=release \ |
| 51 |
--without-ccache \ |
| 52 |
--with-intl-api \ |
| 53 |
--with-libclang-path="$(llvm-config --libdir)" \ |
| 54 |
@@ -614,6 +613,11 @@ src_configure() { |
| 55 |
--x-includes="${SYSROOT}${EPREFIX}/usr/include" \ |
| 56 |
--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)" |
| 57 |
|
| 58 |
+ # Set update channel |
| 59 |
+ local update_channel=release |
| 60 |
+ [[ ${MOZ_ESR} == 1 ]] && update_channel=esr |
| 61 |
+ mozconfig_add_options_ac '' --update-channel=${update_channel} |
| 62 |
+ |
| 63 |
if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then |
| 64 |
mozconfig_add_options_ac '' --enable-rust-simd |
| 65 |
fi |
Archives