Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 12 Feb 2019 01:24:01
Message-Id: 1549934615.168cbc2f264cdefc17050925183d1b0e56129dda.whissi@gentoo
commit:     168cbc2f264cdefc17050925183d1b0e56129dda
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 01:20:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Feb 12 01:23:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168cbc2f

mozconfig-v6.60.eclass: set correct update channel for ESR versions

Closes: https://bugs.gentoo.org/677722
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 eclass/mozconfig-v6.60.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass
index 083b0cd7e61..b090218ac81 100644
--- a/eclass/mozconfig-v6.60.eclass
+++ b/eclass/mozconfig-v6.60.eclass
@@ -221,6 +221,11 @@ mozconfig_config() {
 	# Must pass release in order to properly select linker
 	mozconfig_annotate 'Enable by Gentoo' --enable-release
 
+	# Set correct update channel, bug 677722
+	if [[ -n "${MOZ_ESR}" ]] ; then
+		mozconfig_annotate 'set update channel to ESR' --enable-update-channel=esr
+	fi
+
 	# Avoid auto-magic on linker
 	if use clang ; then
 		# This is upstream's default