| 1 |
commit: 68746d8443ca152fcc52f1260fd0018ac9a75f4f |
| 2 |
Author: William Hubbs <william.hubbs <AT> sony <DOT> com> |
| 3 |
AuthorDate: Tue Mar 10 22:44:16 2020 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 10 22:48:13 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68746d84 |
| 7 |
|
| 8 |
go-module.eclass: replace GOFLAGS if EGO_VENDOR is being used |
| 9 |
|
| 10 |
We can't repeat the -mod flag, so we need to replace the GOFLAGS if |
| 11 |
EGO_VENDOR is being used. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/7111640 |
| 14 |
|
| 15 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 16 |
|
| 17 |
eclass/go-module.eclass | 4 +++- |
| 18 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass |
| 21 |
index c3ad5159bad..4edffa70e42 100644 |
| 22 |
--- a/eclass/go-module.eclass |
| 23 |
+++ b/eclass/go-module.eclass |
| 24 |
@@ -388,7 +388,9 @@ _go-module_src_unpack_vendor() { |
| 25 |
-f "${DISTDIR}/${tarball}" || die |
| 26 |
eend |
| 27 |
done |
| 28 |
- [[ ${#EGO_VENDOR[@]} -gt 0 ]] && GOFLAGS+=" -mod=vendor" |
| 29 |
+ # replace GOFLAGS if EGO_VENDOR is being used |
| 30 |
+ [[ ${#EGO_VENDOR[@]} -gt 0 ]] && |
| 31 |
+ GOFLAGS="-v -x -mod=vendor" |
| 32 |
eqawarn "${P}.ebuild: EGO_VENDOR will be removed in the future." |
| 33 |
eqawarn "Please request that the author migrate to EGO_SUM." |
| 34 |
} |
Archives