| 1 |
commit: 168cbc2f264cdefc17050925183d1b0e56129dda |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 12 01:20:28 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 12 01:23:35 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168cbc2f |
| 7 |
|
| 8 |
mozconfig-v6.60.eclass: set correct update channel for ESR versions |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/677722 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/mozconfig-v6.60.eclass | 5 +++++ |
| 14 |
1 file changed, 5 insertions(+) |
| 15 |
|
| 16 |
diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass |
| 17 |
index 083b0cd7e61..b090218ac81 100644 |
| 18 |
--- a/eclass/mozconfig-v6.60.eclass |
| 19 |
+++ b/eclass/mozconfig-v6.60.eclass |
| 20 |
@@ -221,6 +221,11 @@ mozconfig_config() { |
| 21 |
# Must pass release in order to properly select linker |
| 22 |
mozconfig_annotate 'Enable by Gentoo' --enable-release |
| 23 |
|
| 24 |
+ # Set correct update channel, bug 677722 |
| 25 |
+ if [[ -n "${MOZ_ESR}" ]] ; then |
| 26 |
+ mozconfig_annotate 'set update channel to ESR' --enable-update-channel=esr |
| 27 |
+ fi |
| 28 |
+ |
| 29 |
# Avoid auto-magic on linker |
| 30 |
if use clang ; then |
| 31 |
# This is upstream's default |
Archives