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

[William Hubbs]

commit:     68746d8443ca152fcc52f1260fd0018ac9a75f4f
Author:     William Hubbs <william.hubbs <AT> sony <DOT> com>
AuthorDate: Tue Mar 10 22:44:16 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 22:48:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68746d84

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

 eclass/go-module.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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