[gentoo-commits] repo/gentoo:master commit in: eclass/

[William Hubbs]

commit:     f3c78c7bd7a0ea69fafdf7d3747e6f4008a8afea
Author:     William Hubbs <william.hubbs <AT> sony <DOT> com>
AuthorDate: Tue Mar 10 16:35:38 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 16:43:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c78c7b

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 <AT> gentoo.org>

 eclass/go-module.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
index 51484332335..c3ad5159bad 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."
 }