| 1 |
commit: f34ce87c547ed6082b39044e2bee993325db98d8 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 6 23:25:20 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 6 23:27:12 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34ce87c |
| 7 |
|
| 8 |
app-emulation/skopeo: Fix compile with go-1.13 |
| 9 |
|
| 10 |
This fix is conditional on go-1.13 since -mod=vendor fails with |
| 11 |
go-1.12 like this: |
| 12 |
|
| 13 |
build flag -mod=vendor only valid when using modules |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
| 16 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 17 |
|
| 18 |
app-emulation/skopeo/skopeo-0.1.39.ebuild | 3 ++- |
| 19 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/app-emulation/skopeo/skopeo-0.1.39.ebuild b/app-emulation/skopeo/skopeo-0.1.39.ebuild |
| 22 |
index 49a0b85e587..80e35c4d984 100644 |
| 23 |
--- a/app-emulation/skopeo/skopeo-0.1.39.ebuild |
| 24 |
+++ b/app-emulation/skopeo/skopeo-0.1.39.ebuild |
| 25 |
@@ -31,7 +31,8 @@ RESTRICT="test" |
| 26 |
src_compile() { |
| 27 |
local BUILDTAGS="containers_image_ostree_stub" |
| 28 |
set -- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" \ |
| 29 |
- go build -ldflags "-X main.gitCommit=${COMMIT}" \ |
| 30 |
+ go build $(has_version -b '>=dev-lang/go-1.13' && printf -- -mod=vendor) \ |
| 31 |
+ -ldflags "-X main.gitCommit=${COMMIT}" \ |
| 32 |
-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \ |
| 33 |
-o skopeo ./cmd/skopeo |
| 34 |
echo "$@" |
Archives