From: William Hubbs <william.hubbs@sony.com>
Date: Tue, 10 Mar 2020 16:35:38 +0000 (-0500)
Subject: go-module.eclass: fix regression with -mod=vendor setting
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3c78c7bd7a0ea69fafdf7d3747e6f4008a8afea;p=gentoo.git

go-module.eclass: fix regression with -mod=vendor setting

If EGO_VENDOR is tested in global scope, it needs to be set before the
eclass is inherited. Several ebuilds do not do this, so we need to
perform this test and set -mod=vendor in the appropriate phase function.

Signed-off-by: William Hubbs <williamh@gentoo.org>
---

diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
index 51484332335b..c3ad5159bad8 100644
--- a/eclass/go-module.eclass
+++ b/eclass/go-module.eclass
@@ -78,7 +78,6 @@ export GOCACHE="${T}/go-build"
 # -mod=readonly do not update go.mod/go.sum but fail if updates are needed
 # -mod=vendor use the vendor directory instead of downloading dependencies
 export GOFLAGS="-v -x -mod=readonly"
-[[ ${#EGO_VENDOR[@]} -gt 0 ]] && GOFLAGS+=" -mod=vendor"
 
 # Do not complain about CFLAGS etc since go projects do not use them.
 QA_FLAGS_IGNORED='.*'
@@ -389,6 +388,7 @@ _go-module_src_unpack_vendor() {
 			-f "${DISTDIR}/${tarball}" || die
 		eend
 	done
+	[[ ${#EGO_VENDOR[@]} -gt 0 ]] && GOFLAGS+=" -mod=vendor"
 	eqawarn "${P}.ebuild: EGO_VENDOR will be removed in the future."
 	eqawarn "Please request that the author migrate to EGO_SUM."
 }