From: William Hubbs <william.hubbs@sony.com>
Date: Tue, 10 Mar 2020 22:44:16 +0000 (-0500)
Subject: go-module.eclass: replace GOFLAGS if EGO_VENDOR is being used
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68746d8443ca152fcc52f1260fd0018ac9a75f4f;p=gentoo.git

go-module.eclass: replace GOFLAGS if EGO_VENDOR is being used

We can't repeat the -mod flag, so we need to replace the GOFLAGS if
EGO_VENDOR is being used.

Closes: https://bugs.gentoo.org/7111640

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

diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
index c3ad5159bad8..4edffa70e42b 100644
--- a/eclass/go-module.eclass
+++ b/eclass/go-module.eclass
@@ -388,7 +388,9 @@ _go-module_src_unpack_vendor() {
 			-f "${DISTDIR}/${tarball}" || die
 		eend
 	done
-	[[ ${#EGO_VENDOR[@]} -gt 0 ]] && GOFLAGS+=" -mod=vendor"
+	# replace GOFLAGS if EGO_VENDOR is being used
+	[[ ${#EGO_VENDOR[@]} -gt 0 ]] &&
+		GOFLAGS="-v -x -mod=vendor"
 	eqawarn "${P}.ebuild: EGO_VENDOR will be removed in the future."
 	eqawarn "Please request that the author migrate to EGO_SUM."
 }