summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2019-09-06 16:25:20 -0700
committerZac Medico <zmedico@gentoo.org>2019-09-06 16:27:12 -0700
commitf34ce87c547ed6082b39044e2bee993325db98d8 (patch)
treee26847072fb4bb9fdfe6ba9c15e5cbfa90fd0d54 /app-emulation/skopeo
parentapp-emulation/cri-o: Bump to version 1.15.1 (diff)
downloadgentoo-f34ce87c547ed6082b39044e2bee993325db98d8.tar.gz
gentoo-f34ce87c547ed6082b39044e2bee993325db98d8.tar.bz2
gentoo-f34ce87c547ed6082b39044e2bee993325db98d8.zip
app-emulation/skopeo: Fix compile with go-1.13
This fix is conditional on go-1.13 since -mod=vendor fails with go-1.12 like this: build flag -mod=vendor only valid when using modules Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'app-emulation/skopeo')
-rw-r--r--app-emulation/skopeo/skopeo-0.1.39.ebuild3
1 files changed, 2 insertions, 1 deletions
diff --git a/app-emulation/skopeo/skopeo-0.1.39.ebuild b/app-emulation/skopeo/skopeo-0.1.39.ebuild
index 49a0b85e5876..80e35c4d984b 100644
--- a/app-emulation/skopeo/skopeo-0.1.39.ebuild
+++ b/app-emulation/skopeo/skopeo-0.1.39.ebuild
@@ -31,7 +31,8 @@ RESTRICT="test"
src_compile() {
local BUILDTAGS="containers_image_ostree_stub"
set -- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" \
- go build -ldflags "-X main.gitCommit=${COMMIT}" \
+ go build $(has_version -b '>=dev-lang/go-1.13' && printf -- -mod=vendor) \
+ -ldflags "-X main.gitCommit=${COMMIT}" \
-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-o skopeo ./cmd/skopeo
echo "$@"